diff --git a/.npmignore b/.npmignore
index 2bdd752..103599a 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,5 +1,7 @@
 /docs
 /example
+/node_modules
 .eslintignore
 .eslintrc.js
-.travis.yml
\ No newline at end of file
+.travis.yml
+yarn.lock
\ No newline at end of file
diff --git a/docs/zh-cn/struct/Event.md b/docs/zh-cn/struct/Event.md
index 77c5823..8290472 100644
--- a/docs/zh-cn/struct/Event.md
+++ b/docs/zh-cn/struct/Event.md
@@ -1,6 +1,6 @@
 # 事件
 
-采用[react-native-general-listener](https://github.com/gaoxiaosong/react-native-general-listener)作为事件监听的类，这个库是支持多级层次的事件结构，并支持对所有下级事件的监听。
+采用[@hecom/listener](https://github.com/hecom-rn/listener)作为事件监听的类，这个库是支持多级层次的事件结构，并支持对所有下级事件的监听。
 
 事件类型都放在`src/constant.js`中，其中`BaseEvent`代表基础事件类型，是每个事件的根类型。
 
diff --git a/example/yarn.lock b/example/yarn.lock
index edff6f6..655b006 100644
--- a/example/yarn.lock
+++ b/example/yarn.lock
@@ -797,6 +797,30 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
+"@egjs/hammerjs@^2.0.17":
+  version "2.0.17"
+  resolved "https://registry.npmjs.org/@egjs/hammerjs/-/hammerjs-2.0.17.tgz#5dc02af75a6a06e4c2db0202cae38c9263895124"
+  integrity sha512-XQsZgjm2EcVUiZQf11UBJQfmZeEmOW8DpI1gsFeln6w0ae0ii4dMQEQ0kjl6DspdWX1aGY1/loyXnP0JS06e/A==
+  dependencies:
+    "@types/hammerjs" "^2.0.36"
+
+"@hecom-rn/react-native-full-image-picker@1.3.1":
+  version "1.3.1"
+  resolved "https://registry.npmjs.org/@hecom-rn/react-native-full-image-picker/-/react-native-full-image-picker-1.3.1.tgz#b22b70fde9dcfb53ebdde830b9e19ad5a14266cb"
+  integrity sha512-e9ZLGwgyBDsmJW+kvsJtekcSlPZP/LfLbrUAvw8AS0XphRMBwQ1uGJjO+zFH5j1dUwXa30bD2wRMytYvtXhvUg==
+  dependencies:
+    "@react-native-community/cameraroll" "^1.2.1"
+    react-native-fs "^2.13.3"
+    react-native-pure-navigation-bar "^1.4.7"
+    react-native-root-siblings "^3.1.7"
+
+"@hecom-rn/react-native-general-actionsheet@1.0.5":
+  version "1.0.5"
+  resolved "https://registry.npmjs.org/@hecom-rn/react-native-general-actionsheet/-/react-native-general-actionsheet-1.0.5.tgz#2d2f8584e408fb1ed99614be9572473e0cbc4bf1"
+  integrity sha512-aA4aDwxw/ijzdWeumWKbMUFkpTO7lg6aioh0LXAS3P9qCExt63Tlh6axjwPj7q8dDkCKc3+2ChdqhbIRC+PeZg==
+  dependencies:
+    react-native-safe-area-utility "^1.0.0"
+
 "@hecom/badge@^1.0.2":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@hecom/badge/-/badge-1.0.3.tgz#ea7691709a47df04e26d858f994a213406ada317"
@@ -807,10 +831,24 @@
   resolved "https://registry.yarnpkg.com/@hecom/image-arrow/-/image-arrow-1.0.3.tgz#cddbd10a1c7e716a7c08d8108f8a00f804a20471"
   integrity sha512-Ao5kIffZUCFcavPjBSoz+2nrMqLHYcv7nwQqqSmgj5nEq0OsS4vpSjTHL1ernZrudnJ/Bodw13w4BjtvQgDHWA==
 
-"@hecom/react-native-image-capinsets@^0.5.1":
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/@hecom/react-native-image-capinsets/-/react-native-image-capinsets-0.5.1.tgz#7f6d8aa340d5b224fa92218f26ac0336cd6e386d"
-  integrity sha512-D6828mND/6WBIaAihQRHRqL4X/ykO97e8XahCBj+69MpH2CMIaMSkiwEIywUOGoZWJfRcFDLHoITeDwUayZUbA==
+"@hecom/listener@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/@hecom/listener/-/listener-1.0.0.tgz#31fd889e8dbf3dcb304e93213052a5d3422e60d3"
+  integrity sha512-hGsqbsecEDRDMgq/MBe2ZqmdUJIMY+NZrDACOC/CndGUoTVaS+LGHUjaidbrYN1b8dCpW2pa6DqRySiUeWHPiA==
+
+"@react-native-community/art@^1.1.2":
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/@react-native-community/art/-/art-1.2.0.tgz#386d95393f6042d9006f9d4bc6063fb898794460"
+  integrity sha512-a+ZcRGl/BzLa89yi33Mbn5SHavsEXqKUMdbfLf3U8MDLElndPqUetoJyGkv63+BcPO49UMWiQRP1YUz6/zfJ+A==
+  dependencies:
+    art "^0.10.3"
+    invariant "^2.2.4"
+    prop-types "^15.7.2"
+
+"@react-native-community/cameraroll@^1.2.1":
+  version "1.7.2"
+  resolved "https://registry.npmjs.org/@react-native-community/cameraroll/-/cameraroll-1.7.2.tgz#d1fc3770fb3c2ab85456cff0a587f756ae4838bf"
+  integrity sha512-qPIE+53Q3T41jD32W6YvzzwZteAwldMttroER2an2yrSoZbIP4r74DOWYLAv2FqS3NBs1k4jQ+fMp5rL22HtkQ==
 
 "@react-native-community/cli@^1.2.1":
   version "1.9.2"
@@ -871,6 +909,11 @@
     react-native-safe-area-view "^0.13.0"
     react-native-screens "^1.0.0 || ^1.0.0-alpha"
 
+"@types/hammerjs@^2.0.36":
+  version "2.0.36"
+  resolved "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.36.tgz#17ce0a235e9ffbcdcdf5095646b374c2bf615a4c"
+  integrity sha512-7TUK/k2/QGpEAv/BCwSHlYu3NXZhQ9ZwBYpzr9tjlPIL2C5BeGhH3DmVavRx3ZNyELX5TLC91JTz/cen6AAtIQ==
+
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -1080,7 +1123,7 @@ array-unique@^0.3.2:
   resolved "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-art@^0.10.0:
+art@^0.10.0, art@^0.10.3:
   version "0.10.3"
   resolved "https://registry.npmjs.org/art/-/art-0.10.3.tgz#b01d84a968ccce6208df55a733838c96caeeaea2"
   integrity sha512-HXwbdofRTiJT6qZX/FnchtldzJjS3vkLJxQilc3Xj+ma2MXjY4UAyQ0ls1XZYVnDvVIBiFZbC6QsvtW86TD6tQ==
@@ -3148,11 +3191,6 @@ jsx-ast-utils@^2.0.1:
   dependencies:
     array-includes "^3.0.3"
 
-keymirror@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/keymirror/-/keymirror-0.1.1.tgz#918889ea13f8d0a42e7c557250eee713adc95c35"
-  integrity sha1-kYiJ6hP40KQufFVyUO7nE63JXDU=
-
 kind-of@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44"
@@ -3237,6 +3275,11 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
+lodash.debounce@4.0.8:
+  version "4.0.8"
+  resolved "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
+
 lodash.pad@^4.1.0:
   version "4.5.1"
   resolved "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70"
@@ -4370,7 +4413,14 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-prop-types@15.7.2, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2:
+prop-types@15.5.8:
+  version "15.5.8"
+  resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.5.8.tgz#6b7b2e141083be38c8595aa51fc55775c7199394"
+  integrity sha1-a3suFBCDvjjIWVqlH8VXdccZk5Q=
+  dependencies:
+    fbjs "^0.8.9"
+
+prop-types@15.7.2, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -4477,13 +4527,6 @@ react-lifecycles-compat@^3.0.4:
   resolved "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
   integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
 
-react-native-camera@^1.8.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/react-native-camera/-/react-native-camera-1.13.1.tgz#19277ccae0a49dbf1b96049da5b95c847ea7aff2"
-  integrity sha512-wYjMi06ygYIiHRM4dSCH914xFUay7Wplx0bAej4iBkZeh54M4AxJDcF4vVZ5vdkpuAg8zvof3l+L1VhcKziMgw==
-  dependencies:
-    prop-types "^15.6.2"
-
 react-native-fs@^2.13.3:
   version "2.13.3"
   resolved "https://registry.yarnpkg.com/react-native-fs/-/react-native-fs-2.13.3.tgz#a422f0ecd8a093a7e99d8d51ff51440e090a18a8"
@@ -4492,30 +4535,6 @@ react-native-fs@^2.13.3:
     base-64 "^0.1.0"
     utf8 "^2.1.1"
 
-react-native-full-image-picker@^1.2.10:
-  version "1.2.11"
-  resolved "https://registry.yarnpkg.com/react-native-full-image-picker/-/react-native-full-image-picker-1.2.11.tgz#342953c5281adc8f8749ee52b96d21a41a57b47f"
-  integrity sha512-cOAyhfbjzl8FFICylcm+c1bwg4jZbuNBaevkAzXeYTtBPZRUOnvXHRFM2D/+IjmaBENFvQi0vSrNCxaaunCREg==
-  dependencies:
-    react-native-camera "^1.8.0"
-    react-native-fs "^2.13.3"
-    react-native-pure-navigation-bar "^1.4.7"
-    react-native-root-siblings "^3.1.7"
-    react-native-video "^4.3.0"
-
-react-native-general-actionsheet@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/react-native-general-actionsheet/-/react-native-general-actionsheet-1.0.3.tgz#4d94f5f7b6295c9a1023383a3f4d72e2d9eaed52"
-  integrity sha512-va60UNTvUTv7Nd0RLYAyqeD0K6KNdrNaSnhD551FFhQb//fJDNm2+ECwfkB2PK4WRgPrElxYBDYpWLiYrzxqvA==
-  dependencies:
-    react-native-pure-navigation-bar "^1.4.6"
-    react-native-root-siblings "^3.1.6"
-
-react-native-general-listener@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/react-native-general-listener/-/react-native-general-listener-1.0.3.tgz#72525b8e77fcc121b10d349984bd24433788efb9"
-  integrity sha512-MGtiKU8pBnJd3ybqkhQM9K+smaQieOHRS8GDQLmxO2pj0vxFNFDUHFOl/IIajczjPF0vNN2+4bJSmu0YAuPzLw==
-
 react-native-general-searchbar@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/react-native-general-searchbar/-/react-native-general-searchbar-1.0.6.tgz#e17f445e57f4402577f54ac0625800e167a5a9da"
@@ -4535,6 +4554,16 @@ react-native-gesture-handler@^1.1.0:
     invariant "^2.2.2"
     prop-types "^15.5.10"
 
+react-native-gesture-handler@^1.6.0:
+  version "1.6.1"
+  resolved "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-1.6.1.tgz#678e2dce250ed66e93af409759be22cd6375dd17"
+  integrity sha512-gQgIKhDiYf754yzhhliagLuLupvGb6ZyBdzYzr7aus3Fyi87TLOw63ers+r4kGw0h26oAWTAdHd34JnF4NeL6Q==
+  dependencies:
+    "@egjs/hammerjs" "^2.0.17"
+    hoist-non-react-statics "^2.3.1"
+    invariant "^2.2.4"
+    prop-types "^15.7.2"
+
 react-native-im-easemob@^1.0.22:
   version "1.0.22"
   resolved "https://registry.yarnpkg.com/react-native-im-easemob/-/react-native-im-easemob-1.0.22.tgz#1f9a325659ae84ef88a7925716414058c366655c"
@@ -4543,31 +4572,31 @@ react-native-im-easemob@^1.0.22:
 react-native-im@../:
   version "0.1.0"
   dependencies:
+    "@hecom-rn/react-native-full-image-picker" "1.3.1"
+    "@hecom-rn/react-native-general-actionsheet" "1.0.5"
     "@hecom/badge" "^1.0.2"
     "@hecom/image-arrow" "^1.0.3"
-    "@hecom/react-native-image-capinsets" "^0.5.1"
+    "@hecom/listener" "^1.0.0"
     dateformat "^3.0.3"
     i18n-js "^3.2.1"
     react-native-fs "^2.13.3"
-    react-native-full-image-picker "^1.2.10"
-    react-native-general-actionsheet "^1.0.3"
-    react-native-general-listener "^1.0.3"
     react-native-general-searchbar "^1.0.6"
     react-native-general-storage "^1.0.4"
-    react-native-keyboard-aware-scroll-view "^0.7.4"
+    react-native-gesture-handler "^1.6.0"
+    react-native-keyboard-aware-scroll-view "^0.9.1"
     react-native-localize "^1.1.2"
-    react-native-photo-browse "^1.0.1"
+    react-native-photo-browse "^1.1.1"
     react-native-picklist "^1.2.5"
     react-native-popover-view "^1.0.17"
     react-native-popup-dialog "^0.16.6"
     react-native-pure-navigation-bar "^1.4.9"
-    react-native-root-toast "^3.0.2"
+    react-native-root-toast "^3.1.1"
     react-native-section-list-get-item-layout "^2.2.3"
     react-native-sound "^0.10.9"
     react-native-sound-recorder "^1.3.2"
     react-native-swipe-list-view "^1.5.0"
-    react-native-video "^4.3.0"
     react-navigation-header-buttons "^2.1.1"
+    recyclerlistview "^3.0.0"
     specials "^2.0.4"
 
 react-native-image-pan-zoom@^2.1.9:
@@ -4587,10 +4616,10 @@ react-native-iphone-x-helper@^1.0.3:
   resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.2.0.tgz#9f8a376eb00bc712115abff4420318a0063fa796"
   integrity sha512-xIeTo4s77wwKgBZLVRIZC9tM9/PkXS46Ul76NXmvmixEb3ZwqGdQesR3zRiLMOoIdfOURB6N9bba9po7+x9Bag==
 
-react-native-keyboard-aware-scroll-view@^0.7.4:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/react-native-keyboard-aware-scroll-view/-/react-native-keyboard-aware-scroll-view-0.7.4.tgz#80fb4b56f3c5cb399da0c6832ec52729856ac08a"
-  integrity sha512-5AJ11sGcleiX43IJ32T0kPtIxcd1JWw0R+YPwkgyZWro7uuGBlq09CFW5jS9JTNoGq7crFzFfTcoTIY6B41rNQ==
+react-native-keyboard-aware-scroll-view@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.npmjs.org/react-native-keyboard-aware-scroll-view/-/react-native-keyboard-aware-scroll-view-0.9.1.tgz#9e54b565a5f19b30bed12221d48921781f7630af"
+  integrity sha512-tBZ8rmjELN0F6t5UBp5CW3NYmZXgVnJSzVCssv/OqG2t6kiB+OUTqxNvUP24K+HARX4H+XaW0aEJSFQkQCv6KA==
   dependencies:
     prop-types "^15.6.2"
     react-native-iphone-x-helper "^1.0.3"
@@ -4605,13 +4634,14 @@ react-native-permissions@^1.1.1:
   resolved "https://registry.npmjs.org/react-native-permissions/-/react-native-permissions-1.1.1.tgz#4876004681ff8556454613d85249b01baff9b35b"
   integrity sha512-t0Ujm177bagjUOSzhpmkSz+LqFW04HnY9TeZFavDCmV521fQvFz82aD+POXqWsAdsJVOK3umJYBNNqCjC3g0hQ==
 
-react-native-photo-browse@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/react-native-photo-browse/-/react-native-photo-browse-1.0.1.tgz#404c9cb45060f60f9ce10df7d27a7e5e06ac6dc4"
-  integrity sha512-7eL03jnxChLrIgOzgFWjDQ1KdCnHLd8/l4qLA8DZ6hurzxsoxocXHb8p86NnRi/IOs9/Kcwe9OIpEj8DW8rPpw==
+react-native-photo-browse@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/react-native-photo-browse/-/react-native-photo-browse-1.2.0.tgz#b79cd57193ba30c18854146db58d8d91b4c8dade"
+  integrity sha512-CMkar5g+l1TSun+C2unFAS/DvxeEs1Ru194EJ9t+TpblLRnMv1Ep0LkURks7FTh6UQmqowwhYV3S6zHyZK09VQ==
   dependencies:
+    react-native-fs "^2.13.3"
     react-native-image-zoom-viewer "^2.2.23"
-    react-native-pure-navigation-bar "^1.4.6"
+    react-native-progress "^4.1.0"
     react-native-root-siblings "^3.1.6"
     react-native-root-toast "^3.0.1"
 
@@ -4646,7 +4676,15 @@ react-native-popup-dialog@^0.16.6:
     prop-types "^15.6.0"
     react-native-root-siblings "^3.1.7"
 
-react-native-pure-navigation-bar@^1.4.6, react-native-pure-navigation-bar@^1.4.7, react-native-pure-navigation-bar@^1.4.9:
+react-native-progress@^4.1.0:
+  version "4.1.2"
+  resolved "https://registry.npmjs.org/react-native-progress/-/react-native-progress-4.1.2.tgz#ffb2264ddfeba409c730e36a9791bb7bbe07a00d"
+  integrity sha512-sFHs6k6npWDOyvQoL2NeyOyHb+q1s8iOAOeyzoObN77zkxOAsgJt9FcSJLRq70Mw7qSGNJMFDqCgvYR1huYRwQ==
+  dependencies:
+    "@react-native-community/art" "^1.1.2"
+    prop-types "^15.7.2"
+
+react-native-pure-navigation-bar@^1.4.7, react-native-pure-navigation-bar@^1.4.9:
   version "1.4.9"
   resolved "https://registry.yarnpkg.com/react-native-pure-navigation-bar/-/react-native-pure-navigation-bar-1.4.9.tgz#990d4da090300b57bf643f5e702c5181b62e7ffd"
   integrity sha512-tDktla7L5aaq3T1AcnCGzwYb68o2QtCvaOHBdN0hOy+LI1nrvSp2IBofylHegJTkUYBh64mbyfgmJp/VSbGGww==
@@ -4664,7 +4702,14 @@ react-native-root-siblings@^3.0.0, react-native-root-siblings@^3.1.6, react-nati
     prop-types "^15.6.2"
     static-container "^1.0.0"
 
-react-native-root-toast@^3.0.1, react-native-root-toast@^3.0.2:
+react-native-root-siblings@^4.0.0:
+  version "4.0.6"
+  resolved "https://registry.npmjs.org/react-native-root-siblings/-/react-native-root-siblings-4.0.6.tgz#6dd7eedb725faacd7ba19c159dd279cf2e6d8476"
+  integrity sha512-u/MaJLdD3bnshDFg8HWB0Xys1xlkQy6++3QthQlYw4kOFElobb6V1IIn5r46JvBTr9cf6dXsrFC4zPVXuwW1ww==
+  dependencies:
+    static-container "^1.5.1"
+
+react-native-root-toast@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/react-native-root-toast/-/react-native-root-toast-3.0.2.tgz#85c0c50d300c895a35ea98587b4ad4c9540297ee"
   integrity sha512-I3yJkfFP7yEBRBiJAToQgPtxZwf+8j60KDPN3nOYSg9Nfqldq6VwIC4Pgq6Wt8XgqpSuIBtwGYfpc5JS8TxFeg==
@@ -4672,6 +4717,19 @@ react-native-root-toast@^3.0.1, react-native-root-toast@^3.0.2:
     prop-types "^15.5.10"
     react-native-root-siblings "^3.0.0"
 
+react-native-root-toast@^3.1.1:
+  version "3.2.1"
+  resolved "https://registry.npmjs.org/react-native-root-toast/-/react-native-root-toast-3.2.1.tgz#f456d029f5c5b76e4b686334f25371465478a3be"
+  integrity sha512-BNf6LKMqcIAonKgqCGQWk+1lduFqSjPYbEF0FygMZbXhODRTvrGUAvAgV6kfamVPOkKHUkPU7dnnvmgEQ8ZDzQ==
+  dependencies:
+    prop-types "^15.5.10"
+    react-native-root-siblings "^4.0.0"
+
+react-native-safe-area-utility@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/react-native-safe-area-utility/-/react-native-safe-area-utility-1.0.0.tgz#1dc289145f67d65ff70cb57b3aa8898e2d588438"
+  integrity sha512-tavIx5ONlc+VqthQnjgNUE2WqfZJ/kf2kXyWq7y/wRxz5Ag0wG8eInQnRYkKA1cM7LncPx+9agBmy54IOXY2dw==
+
 react-native-safe-area-view@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.10.0.tgz#e8e9228d22698c0f82ad1202d24a4e4977260489"
@@ -4725,15 +4783,6 @@ react-native-tab-view@^1.3.4:
   dependencies:
     prop-types "^15.6.1"
 
-react-native-video@^4.3.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/react-native-video/-/react-native-video-4.4.0.tgz#18012cb8ad90aac42be3d04c92430f820f3ab03b"
-  integrity sha512-QXdud1JII1tuTVeYAedWqRJnf8eDuY87ucSXdERuWQb9umuLVbkF1BcAckhiWf3/+R4YdKBFR0nY2n4o8e0qkg==
-  dependencies:
-    keymirror "^0.1.1"
-    prop-types "^15.5.10"
-    shaka-player "^2.4.4"
-
 react-native@0.59.5:
   version "0.59.5"
   resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.59.5.tgz#79500d2885a3dc83216715e1fc6effa878ad6ea9"
@@ -4886,6 +4935,15 @@ readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@^2.2.2, readable
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+recyclerlistview@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/recyclerlistview/-/recyclerlistview-3.0.0.tgz#72ef5ef0246cb851695698c37836001651e70b4f"
+  integrity sha512-t9AiPgwGkCwhCXJhrRj7UhEJ0kpiOkc4g89txurZs2crACg8zVStRRYk6tehECz2NQvmM9Gmp+apGBqie33++Q==
+  dependencies:
+    lodash.debounce "4.0.8"
+    prop-types "15.5.8"
+    ts-object-utils "0.0.5"
+
 regenerate-unicode-properties@^7.0.0:
   version "7.0.0"
   resolved "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c"
@@ -5204,11 +5262,6 @@ setprototypeof@1.1.0:
   resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
   integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
-shaka-player@^2.4.4:
-  version "2.4.7"
-  resolved "https://registry.yarnpkg.com/shaka-player/-/shaka-player-2.4.7.tgz#8532e53ba7d8781b0785b552c7c68681c13c3206"
-  integrity sha512-KXYVB7snrrmcmDvusf2IIGOXZCvrlb6vXkl1q0pXP/QdUkvHm2SsW6jIXKvDz9xsvs9Pt/R7tm8POgfUOzybcQ==
-
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -5398,6 +5451,11 @@ static-container@^1.0.0:
   resolved "https://registry.yarnpkg.com/static-container/-/static-container-1.3.0.tgz#e4f7b4be4e42954e3d1955ab7b3974a78b7bad87"
   integrity sha512-OJnvgv6tq9T5QbFUMioEK4WP48pMn/X4qdcrWAhop6boMMz6pMmWPWXgjimn1wKqcClZ6Ff0iSKViRXzwx111w==
 
+static-container@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.npmjs.org/static-container/-/static-container-1.5.1.tgz#9d7a94e04dea864539a7b6a1304843ada740dc19"
+  integrity sha512-OFChfLKIvSzaMA3otS5CEabJTIzHFPhMxogIT+io4F207PXTvS6woFyjXIyXyqMIYAhryePGeFZYC6uLcG1lpA==
+
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -5630,6 +5688,11 @@ trim-right@^1.0.1:
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
   integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 
+ts-object-utils@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.npmjs.org/ts-object-utils/-/ts-object-utils-0.0.5.tgz#95361cdecd7e52167cfc5e634c76345e90a26077"
+  integrity sha1-lTYc3s1+UhZ8/F5jTHY0XpCiYHc=
+
 tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
diff --git a/language/zh.json b/language/zh.json
index 182b3ec..b951b05 100644
--- a/language/zh.json
+++ b/language/zh.json
@@ -23,8 +23,9 @@
     "IMPageChooseConversationTitle": "选择聊天",
     "IMPageChooseConversationCreateNew": "创建新聊天",
     "IMPageChooseUserSelectFromOrg": "按部门选同事",
+    "IMPageChooseUserAll": "所有人",
     "IMSettingAddGroupMember": "添加群成员",
-    "IMSettingAllMembers": "全体成员({{length}})",
+    "IMSettingAllMembers": "查看全体群成员({{length}})",
     "IMSettingAllowInvite": "允许添加成员",
     "IMSettingAvoid": "消息免打扰",
     "IMSettingChooseGroupMember": "选择群成员",
@@ -37,6 +38,8 @@
     "IMSettingGroupNameChangeTips": "请输入群聊名称",
     "IMSettingGroupNameNotEmpty": "群聊名称不能为空",
     "IMSettingLeaveGroupDestroy": "解散群聊",
+    "IMSettingGroupAnnouncement": "群公告",
+    "IMSettingGroupAnnouncementChange": "更改群公告",
     "IMSettingLeaveGroupQuit": "退出群聊",
     "IMSettingRemoveGroupMember": "删除群成员",
     "IMSettingTop": "置顶聊天",
@@ -44,5 +47,6 @@
     "IMSettingTransferOwnerAction": "转交",
     "IMToastError": "{{action}}失败",
     "IMToastMessageNotSupport": "当前版本暂不支持该消息",
-    "IMToastSuccess": "{{action}}成功"
-}
\ No newline at end of file
+    "IMToastSuccess": "{{action}}成功",
+    "IMSettingGroupDataInfo": "资料"
+}
diff --git a/package.json b/package.json
index 17ee2e7..cf47455 100644
--- a/package.json
+++ b/package.json
@@ -19,47 +19,68 @@
   },
   "homepage": "https://github.com/gaoxiaosong/react-native-im#readme",
   "dependencies": {
-    "@hecom/badge": "^1.0.2",
-    "@hecom/image-arrow": "^1.0.3",
-    "@hecom-rn/react-native-full-image-picker":"1.3.1",
-    "@hecom-rn/react-native-general-actionsheet":"1.0.5",
+    "@hecom-rn/react-native-general-actionsheet": "1.0.5",
     "dateformat": "^3.0.3",
     "i18n-js": "^3.2.1",
-    "react-native-fs": "^2.13.3",
-    "react-native-general-listener": "^1.0.3",
-    "react-native-general-searchbar": "^1.0.6",
-    "react-native-general-storage": "^1.0.4",
-    "react-native-gesture-handler": "^1.6.0",
-    "react-native-keyboard-aware-scroll-view": "^0.9.1",
-    "react-native-localize": "^1.1.2",
-    "react-native-photo-browse": "^1.1.0",
-    "react-native-picklist": "^1.2.5",
-    "react-native-popover-view": "^1.0.17",
-    "react-native-popup-dialog": "^0.16.6",
-    "react-native-pure-navigation-bar": "^1.4.9",
-    "react-native-root-toast": "^3.1.1",
+    "md5": "^2.3.0",
     "react-native-section-list-get-item-layout": "^2.2.3",
-    "react-native-sound": "^0.10.9",
-    "react-native-sound-recorder": "^1.3.2",
-    "react-native-swipe-list-view": "^1.5.0",
-    "react-navigation-header-buttons": "^2.1.1",
-    "specials": "^2.0.4"
+    "recyclerlistview": "^3.0.0"
   },
   "peerDependencies": {
+    "@hecom-rn/react-native-full-image-picker": "*",
+    "@hecom/badge": "*",
+    "@hecom/image-arrow": "*",
+    "@hecom/listener": "*",
     "@hecom/react-native-image-capinsets": "*",
+    "@hecom/react-native-picklist": "*",
+    "@hecom/react-native-pure-navigation-bar": "*",
+    "@hecom/storage": ">=1.1",
+    "@react-navigation/native": "*",
     "react": "*",
     "react-native": "*",
+    "react-native-fs": ">=2",
+    "react-native-general-searchbar": ">=1",
+    "react-native-gesture-handler": ">=1",
+    "react-native-keyboard-aware-scroll-view": "*",
+    "react-native-localize": "*",
+    "react-native-modals": "*",
+    "react-native-photo-browse": "*",
+    "react-native-popover-view": ">=3.0.3",
+    "react-native-root-toast": "*",
+    "react-native-sound": "*",
+    "react-native-sound-recorder": "*",
+    "react-native-swipe-list-view": "*",
     "react-native-video": "*",
-    "react-navigation": "*"
+    "react-navigation-header-buttons": ">=2.1.1",
+    "specials": "^2.0.4",
+    "react-native-permissions": "*"
   },
   "devDependencies": {
+    "@hecom/badge": "^1.0.3",
+    "@hecom/image-arrow": "^1.0.3",
+    "@hecom/listener": "^1.0.0",
+    "@hecom/storage": "1.1.0",
     "@types/i18n-js": "^3.0.1",
     "@types/promise.prototype.finally": "^2.0.3",
     "@types/react": "^16.8.14",
     "@types/react-native": "^0.57.46",
-    "@types/react-navigation": "^3.0.6",
     "eslint-plugin-automatic": "latest",
+    "react-native-fs": "^2.13.3",
+    "react-native-general-searchbar": "^1.0.6",
+    "react-native-gesture-handler": "^1.6.0",
     "react-native-im-easemob": "^1.0.24",
-    "tslib": "^1.9.3"
+    "react-native-keyboard-aware-scroll-view": "^0.9.1",
+    "react-native-localize": "^1.1.2",
+    "react-native-modals": "^0.19.9",
+    "react-native-photo-browse": "1.3.0",
+    "react-native-picklist": "^1.2.5",
+    "react-native-popover-view": "^3.0.3",
+    "react-native-root-toast": "^3.2.1",
+    "react-native-sound": "^0.10.9",
+    "react-native-sound-recorder": "^1.3.2",
+    "react-native-swipe-list-view": "^1.5.0",
+    "react-navigation-header-buttons": "^2.1.1",
+    "tslib": "^1.9.3",
+    "react-native-permissions": "^2.2.2"
   }
 }
diff --git a/plugin/easemob/IMConversationDelegate.ts b/plugin/easemob/IMConversationDelegate.ts
index 11197a2..e86678b 100644
--- a/plugin/easemob/IMConversationDelegate.ts
+++ b/plugin/easemob/IMConversationDelegate.ts
@@ -26,6 +26,12 @@ export default function () {
     Delegate.im.conversation.deleteOne = (imId) => {
         return ChatManager.deleteConversation(imId);
     };
+    Delegate.im.conversation.deleteAllMessages = (imId, chatType) => {
+        return ChatManager.deleteAllMessages(imId, chatType);
+    };
+    Delegate.im.conversation.updateMessageExt = (messageId, ext) => {
+        return ChatManager.updateMessageExt(messageId, ext);
+    };
     // TODO updateConfig
     Delegate.im.conversation.markAllRead = (imId, chatType) => {
         return ChatManager.markAllMessagesAsRead(imId, chatType);
diff --git a/plugin/easemob/ParseAction.ts b/plugin/easemob/ParseAction.ts
index 7ce4377..da1d787 100644
--- a/plugin/easemob/ParseAction.ts
+++ b/plugin/easemob/ParseAction.ts
@@ -37,6 +37,7 @@ function convertText(message: Typings.Message.Origin) {
             text: message.body.text,
             atMemberList: message.ext ? message.ext.atMemberList : [],
             isSystem: message.ext ? message.ext.isSystemMessage : false,
+            quoteMsg: message.ext ? message.ext.quoteMsg : undefined,
         }
     );
 }
@@ -79,6 +80,7 @@ function convertVideo(message: Typings.Message.Origin) {
             localPath: message.body.localPath,
             remotePath: message.body.remotePath,
             duration: 0, // TODO duration
+            shouldRead: message.ext.shouldRead,
         }
     );
 }
diff --git a/plugin/easemob/SendAction.ts b/plugin/easemob/SendAction.ts
index a6ff9b6..fff20f1 100644
--- a/plugin/easemob/SendAction.ts
+++ b/plugin/easemob/SendAction.ts
@@ -43,6 +43,7 @@ function sendText(params: Typings.Action.Send.Params<Typings.Message.TextBody>)
             chatType,
             message.data.text,
             {
+                quoteMsg:message.data.quoteMsg,
                 atMemberList: message.data.atMemberList,
                 ...ext,
             },
diff --git a/plugin/message/display/ImageBubble.tsx b/plugin/message/display/ImageBubble.tsx
index e3d9f84..a8e5b62 100644
--- a/plugin/message/display/ImageBubble.tsx
+++ b/plugin/message/display/ImageBubble.tsx
@@ -65,21 +65,31 @@ export default class extends React.PureComponent<Props, State> {
                     resizeMode={'contain'}
                     source={this.state.source}
                     style={[styles.image, {width, height}]}
+                    onError={this.onError}
                 />
             </View>
         ) : null;
     }
 
+    onError = () => this.setState({source: require('./image/load_error.png')})
+
     public onPress() {
-        const {message: {data: {remotePath}, messageId}, messages = []} = this.props;
-        const images = messages.filter(({type}) => type === IMConstant.MessageType.image).reverse();
-        const currentIndex = images.findIndex(image => image.messageId === messageId);
-        showPhotoBrowserPage({
-            currentIndex: currentIndex < 0 ? 0 : currentIndex,
-            images: images.length === 0 ? [remotePath] : images.map(({data: {remotePath}}) => remotePath),
-            canSave: true,
-            renderIndicator: () => null,
-        });
+        const {message: {data: {remotePath, localPath}, messageId}, messages = []} = this.props;
+
+        if (!remotePath && !localPath) {
+            return;
+         }
+         const images = messages.filter(({type, data: {remotePath: remoteP, localPath: localP}}) => {
+             return type === IMConstant.MessageType.image &&
+             ((remoteP && remoteP.length > 0) || (localP && localP.length > 0))
+         }).reverse();
+         const currentIndex = images.findIndex(image => image.messageId === messageId);
+         showPhotoBrowserPage({
+             currentIndex: currentIndex < 0 ? 0 : currentIndex,
+             images: images.length === 0 ? [remotePath] : images.map(({data: {remotePath, localPath}}) => remotePath ? remotePath : localPath),
+             canSave: true,
+             renderIndicator: () => null,
+         });
     }
 }
 
diff --git a/plugin/message/display/QuoteMsgBubble.tsx b/plugin/message/display/QuoteMsgBubble.tsx
new file mode 100644
index 0000000..0b30d30
--- /dev/null
+++ b/plugin/message/display/QuoteMsgBubble.tsx
@@ -0,0 +1,74 @@
+import React from 'react';
+import { Platform, StyleSheet, Text, TextStyle, TouchableWithoutFeedback } from 'react-native';
+import { Message } from 'react-native-im/standard/typings';
+import { Model as MsgModel } from '../../../standard';
+
+interface Props {
+    message: Message.General;
+    maxWidth: number,
+    paddingLeft: number,
+    paddingRight: number,
+    innerMaxWidth: number,
+}
+
+export default class QuoteMsgBubble extends React.PureComponent<Props> {
+
+    constructor(props: Props) {
+        super(props);
+    }
+
+
+    render() {
+
+        const { message: { data: { quoteMsg } }, maxWidth, paddingRight } = this.props;
+
+        return quoteMsg ? (
+            <TouchableWithoutFeedback
+                onPress={this._onPress.bind(this)}
+            >
+                <Text
+                    style={[styles.quoteText, { maxWidth: maxWidth, paddingLeft: paddingRight, paddingRight: paddingRight }]}
+                    numberOfLines={1}
+                    ellipsizeMode={'tail'}
+                >
+                    {(MsgModel.Quote.msgDescResolver.get(quoteMsg.type) as Function)(quoteMsg)}
+                </Text>
+            </TouchableWithoutFeedback>
+        ) : null;
+    }
+
+    protected _onPress() {
+        const { message: { data: { quoteMsg: quoteMsg } } } = this.props;
+        (MsgModel.Quote.msgClickHandleResolver.get(quoteMsg.type) as Function)(quoteMsg);
+    }
+}
+
+const styles = StyleSheet.create({
+    container: {
+        flexDirection: 'column',
+        alignItems: 'flex-end',
+    },
+    quoteText: {
+        height: 20,
+        fontSize: 13,
+        marginTop: 3,
+        paddingTop: 2,
+        alignContent: "center",
+        paddingBottom: 2,
+        borderRadius: 3,
+        backgroundColor: '#cccccc',
+        ...Platform.select({
+            android: { textAlignVertical: 'center' },
+        }),
+        overflow: 'hidden',
+    } as TextStyle,
+    view: {
+        backgroundColor: 'transparent',
+        paddingHorizontal: 13,
+        paddingVertical: 10,
+        flexDirection: 'row',
+        justifyContent: 'flex-start',
+        alignItems: 'center',
+        flexWrap: 'wrap',
+    },
+});
\ No newline at end of file
diff --git a/plugin/message/display/VideoBubble.tsx b/plugin/message/display/VideoBubble.tsx
index cd9b710..02b857a 100644
--- a/plugin/message/display/VideoBubble.tsx
+++ b/plugin/message/display/VideoBubble.tsx
@@ -1,47 +1,164 @@
 import React from 'react';
-import { Image, StyleSheet, View } from 'react-native';
+import {ActivityIndicator, Image, Platform, StyleSheet, Text, View} from "react-native";
 import Video from 'react-native-video';
-import { Typings } from '../../../standard';
+import {Typings} from '../../../standard';
+import OSSManager from 'core/oss/OSSManager';
+import md5 from 'md5';
+import RNFS from "react-native-fs";
+
+import {IMStandard} from "react-native-im/index";
+
 
 export type Props = Typings.Action.Display.Params<Typings.Message.VideoBody>;
 
 export interface State {
     paused: boolean;
+    downloadReady: boolean;
+    displaySize?: Size;
+}
+
+class Size {
+    width: number;
+    height: number;
 }
 
 export default class extends React.PureComponent<Props, State> {
     protected player: Video | null;
-
+    private isAndroid: Boolean = Platform.OS === 'android';
     state: State = {
         paused: true,
+        downloadReady: false,
     };
+    private remotePath: string;
+    private localPath: string;
+    private playableDuration: any;
+    private displayPath: string;
+    private maxDisplaySize: number;
+    private size: Size;
+
+    constructor(props: Props) {
+        super(props);
+        const {message: {data: {localPath, remotePath, playableDuration, size}}, maxWidth} = props;
+        this.remotePath = remotePath;
+        this.localPath = localPath;
+        this.maxDisplaySize = maxWidth * 0.6;
+        this.size = size;
+        this.playableDuration = playableDuration;
+    }
 
     render() {
-        const {message: {data: {localPath, remotePath}}, maxWidth} = this.props;
-        const width = maxWidth;
-        const height = maxWidth * 0.75;
+        const content = this.state.downloadReady ? this._renderContent() : this._renderLoading();
         return (
             <View>
+                {content}
+            </View>
+        );
+    }
+
+    _renderContent() {
+        let content;
+        if (this.isAndroid) {
+            content = (
+                <Image
+                    style={[styles.video, {...this.state.displaySize}]}
+                    resizeMode='cover'
+                    source={{uri: this.displayPath}}
+                />
+            );
+        } else {
+            content = (
                 <Video
-                    source={{uri: localPath || remotePath}}
+                    source={{uri: this.displayPath}}
                     ref={(ref: Video | null) => this.player = ref}
-                    style={[styles.video, {width, height}]}
+                    style={[styles.video, {...this.state.displaySize}]}
                     paused={this.state.paused}
                     resizeMode="cover"
                     onFullscreenPlayerWillPresent={this._fullScreenPlayerWillPresent.bind(this)}
                     onFullscreenPlayerWillDismiss={this._fullScreenPlayerWillDismiss.bind(this)}
                 />
+            );
+        }
+        return (
+            <View style={{justifyContent: 'flex-end'}}>
+                {content}
                 <Image
-                    style={[styles.image, {width, height}]}
+                    style={[styles.image, {...this.state.displaySize}]}
                     resizeMode='center'
                     source={require('./image/video_play.png')}
                 />
+                <Text style={{
+                    position: 'absolute',
+                    alignSelf: 'flex-end',
+                    color: 'white',
+                    paddingHorizontal: 10,
+                    paddingVertical: 5
+                }}
+                >
+                    {this._convertDuration(this.playableDuration)}
+                </Text>
             </View>
         );
     }
 
+    async _determinSize(size: Size, localPath: string): Promise<Size> {
+        localPath = this._trimPrefix(localPath);
+        if (Platform.OS === 'ios') {
+            localPath = localPath.replace(RNFS.TemporaryDirectoryPath, 'tmp/');
+        }
+        const result = new Size();
+        const radio = size.height / size.width;
+        if (IMStandard.Delegate.func.getVideoMetaData === undefined) {
+            result.width = this.maxDisplaySize;
+            result.height = result.width * radio;
+            return result;
+        }
+        let rotation = 90;
+        try {
+            const metaData = await IMStandard.Delegate.func.getVideoMetaData(localPath);
+            rotation = metaData.rotation;
+        } catch (e) {
+            console.log(`get ${localPath} rotation failed!`);
+        }
+        //land or portrait
+        if (rotation == 0 || rotation == 180) {
+            result.width = this.maxDisplaySize;
+            result.height = result.width * radio;
+        } else {
+            result.height = this.maxDisplaySize;
+            result.width = result.height * radio;
+        }
+
+        return result;
+    }
+
+    _convertDuration(playableDuration: number) {
+        const prefixWithZero = (time: number) => {
+            if (time) {
+                return time < 10 ? `0${time}` : `${time}`
+            }
+            return '00';
+        };
+        let duration = '';
+        if (playableDuration) {
+            let minute = Math.floor(playableDuration / 60);
+            const second = playableDuration % 60;
+            duration = `${prefixWithZero(minute)}:${prefixWithZero(second)}`;
+        }
+        return duration;
+    }
+
+    _renderLoading() {
+        return <ActivityIndicator size="small"/>;
+    }
+
     public onPress() {
-        this.player.presentFullscreenPlayer();
+        if (this.isAndroid) {
+            if (this.state.downloadReady) {
+                IMStandard.Delegate.func.playVideo(this.displayPath.replace('file://', ''));
+            }
+        } else {
+            this.player.presentFullscreenPlayer();
+        }
     }
 
     protected _fullScreenPlayerWillPresent() {
@@ -56,8 +173,72 @@ export default class extends React.PureComponent<Props, State> {
             paused: true,
         });
     }
+
+    componentDidMount() {
+        const checkTask = async () => {
+            if (this.localPath != null && await RNFS.exists(this._trimPrefix(this.localPath))) {
+                this.displayPath = this._filePrefix(this.localPath);
+                this._determinSize(this.size, this.displayPath).then(size => {
+                    this.setState({downloadReady: true, displaySize: size,});
+                });
+
+            } else {
+                if (this.remotePath == null) {
+                    return;
+                }
+                const exist = await RNFS.exists(this._generateLocalPath(this.remotePath));
+                if (exist) {
+                    this.displayPath = this._filePrefix(this._generateLocalPath(this.remotePath));
+                    this._determinSize(this.size, this.displayPath).then(size => {
+                        this.setState({downloadReady: true, displaySize: size,});
+                    });
+                } else {
+                    this._downLoad();
+                }
+            }
+        };
+        checkTask();
+    }
+
+    async _downLoad() {
+        const path = await OSSManager.downloadFile(this.remotePath, this._generateLocalPath(this.remotePath), (percent) => {
+        });
+        this.displayPath = this._filePrefix(path);
+        this._determinSize(this.size, this.displayPath).then(size => {
+            this.setState({downloadReady: true, displaySize: size,});
+        });
+    }
+
+    _generateLocalPath(path: string) {
+        if (this.isAndroid) {
+            return `${RNFS.ExternalCachesDirectoryPath}/${md5(path)}.${path.split('.').pop()}`;
+        } else {
+            return `${RNFS.TemporaryDirectoryPath}/${md5(path)}.${path.split('.').pop()}`;
+        }
+    }
+
+    _filePrefix(path: string) {
+        if (path.startsWith('file://')) {
+            return path;
+        }
+        return `file://${path}`;
+    }
+
+    _trimPrefix(path: string) {
+        if (path.startsWith('file://')) {
+            path = path.replace('file://', '');
+        }
+        return path;
+    }
+
+    componentWillUnmount() {
+        if(this.player!=null){
+            this.player.dismissFullscreenPlayer();
+        }
+    }
 }
 
+
 const styles = StyleSheet.create({
     video: {
         borderRadius: 5,
@@ -66,6 +247,6 @@ const styles = StyleSheet.create({
         position: 'absolute',
         borderRadius: 5,
         top: 0,
-        backgroundColor:'gray',
+        backgroundColor: 'transparent',
     },
-});
\ No newline at end of file
+});
diff --git a/plugin/message/display/VoiceBubble.tsx b/plugin/message/display/VoiceBubble.tsx
index baeebbc..7220260 100644
--- a/plugin/message/display/VoiceBubble.tsx
+++ b/plugin/message/display/VoiceBubble.tsx
@@ -2,6 +2,9 @@ import React from 'react';
 import { Image, StyleSheet, View, Text } from 'react-native';
 import Sound from 'react-native-sound';
 import { Typings } from '../../../standard';
+import Listener from '@hecom/listener';
+
+const voiceListenerKey = 'react-native-im_VoiceBubble_voice_listener_key'
 
 export type Props = Typings.Action.Display.Params<Typings.Message.VoiceBody>;
 
@@ -15,6 +18,7 @@ export default class extends React.PureComponent<Props, State> {
     state: State = {
         isPlaying: false,
     };
+    voiceListener: any;
 
     constructor(props: Props) {
         super(props);
@@ -24,6 +28,12 @@ export default class extends React.PureComponent<Props, State> {
                 console.log('failed to load the sound', error);
             }
         });
+        this.voiceListener = Listener.register(voiceListenerKey, ()=>{
+            if (this.sound.isPlaying()) {
+                this.sound.stop();
+                this.setState({isPlaying: false});
+            }
+        });
     }
 
     componentDidMount() {
@@ -32,6 +42,7 @@ export default class extends React.PureComponent<Props, State> {
 
     componentWillUnmount() {
         this.sound.release();
+        Listener.unregister(voiceListenerKey, this.voiceListener);
     }
 
     render() {
@@ -63,6 +74,7 @@ export default class extends React.PureComponent<Props, State> {
         if (this.state.isPlaying) {
             this.sound.stop();
         } else {
+            Listener.trigger(voiceListenerKey);
             setTimeout(() => {
                 this.sound.play((success) => {
                     if (success) {
diff --git a/plugin/message/display/image/load_error@3x.png b/plugin/message/display/image/load_error@3x.png
new file mode 100644
index 0000000..753a074
Binary files /dev/null and b/plugin/message/display/image/load_error@3x.png differ
diff --git a/plugin/message/display/index.ts b/plugin/message/display/index.ts
index 20c2bfd..863dec7 100644
--- a/plugin/message/display/index.ts
+++ b/plugin/message/display/index.ts
@@ -4,6 +4,7 @@ import ImageBubble from './ImageBubble';
 import LocationBubble from './LocationBubble';
 import VideoBubble from './VideoBubble';
 import VoiceBubble from './VoiceBubble';
+import QuoteMsgBubble from './QuoteMsgBubble';
 
 export {
     GeneralBubble,
@@ -12,4 +13,5 @@ export {
     LocationBubble,
     VideoBubble,
     VoiceBubble,
+    QuoteMsgBubble,
 };
\ No newline at end of file
diff --git a/plugin/message/moreboard/photo.ts b/plugin/message/moreboard/photo.ts
index fa186aa..78d899b 100644
--- a/plugin/message/moreboard/photo.ts
+++ b/plugin/message/moreboard/photo.ts
@@ -1,4 +1,4 @@
-import * as ImagePicker from 'react-native-full-image-picker';
+import * as ImagePicker from '@hecom-rn/react-native-full-image-picker';
 import { Typings } from '../../../standard';
 
 export type ImageResult = Typings.Action.MoreBoard.GeneralResult<Typings.Message.ImageBody>;
diff --git a/plugin/setting/AllMembers.tsx b/plugin/setting/AllMembers.tsx
index c5099db..4aa435e 100644
--- a/plugin/setting/AllMembers.tsx
+++ b/plugin/setting/AllMembers.tsx
@@ -2,6 +2,8 @@ import React from 'react';
 import i18n from 'i18n-js';
 import { Typings, Delegate, PageKeys } from '../../standard';
 import { onAddMembers, onRemoveMembers } from './GeneralUpdate';
+import { Dimensions, TouchableHighlight, StyleSheet, View, Text} from 'react-native';
+import { getSafeAreaInset } from '@hecom/react-native-pure-navigation-bar';
 
 export const name = 'IMSettingAllMembers';
 
@@ -12,23 +14,45 @@ export function getUi(props: Typings.Action.Setting.Params): Typings.Action.Sett
         return null;
     }
     const groupMembers = Delegate.model.Group.getMembers(imId);
+    if (groupMembers.length <= showMaxColumn(props)) {
+        return null;
+    }
+
     return (
-        <Delegate.component.SettingItem
+        <AllMembersCell
             key={key}
-            type={Typings.Component.SettingItemType.Text}
             title={i18n.t('IMSettingAllMembers', {length: groupMembers.length})}
             onPressLine={() => _clickAllMembers(props)}
         />
     );
 }
 
+function showMaxColumn(props: Typings.Action.Setting.Params): number {
+    const {imId} = props;
+    const {width, height} = Dimensions.get('window');
+    const safeInset = getSafeAreaInset();
+    const innerWidth = width - safeInset.left - safeInset.right;
+    const groupOwner = Delegate.model.Group.getOwner(imId);
+    let itemEdge = 50;
+    let column = 0;
+    if (width > height) {
+        const preInternal = 30;
+        column = Math.floor((innerWidth + preInternal) * 1.0 / (itemEdge + preInternal));
+    } else {
+        column = 5;
+    }
+    let canAdd = true;
+    let canRemove = groupOwner === Delegate.user.getMine().userId;
+    const maxRow = 6;
+    const showCount = column * maxRow - (canAdd ? 1 : 0) - (canRemove ? 1 : 0);
+    return showCount;
+}
+
 function _clickAllMembers(props: Typings.Action.Setting.Params): void {
     const {imId, navigation} = props;
     const groupMembers = Delegate.model.Group.getMembers(imId);
     const groupOwner = Delegate.model.Group.getOwner(imId);
-    navigation.navigate({
-        routeName: PageKeys.GroupMembers,
-        params: {
+    navigation.navigate( PageKeys.GroupMembers, {
             groupId: imId,
             members: groupMembers,
             admins: [groupOwner],
@@ -36,6 +60,84 @@ function _clickAllMembers(props: Typings.Action.Setting.Params): void {
             canRemove: groupOwner === Delegate.user.getMine().userId,
             onAddMembers: (memberUserIds: string[]) => onAddMembers(props, memberUserIds),
             onRemoveMembers: (memberUserIds: string[]) => onRemoveMembers(props, memberUserIds),
-        },
-    });
-}
\ No newline at end of file
+        });
+}
+
+export interface Props {
+    title: string;
+    onPressLine?: () => void;
+}
+
+export interface State {
+    allowInvites: boolean;
+}
+
+export class AllMembersCell extends React.PureComponent<Props> {
+    constructor(props: Props) {
+        super(props);
+    }
+
+    render() {
+        const {onPressLine} = this.props;
+        return onPressLine ? (
+            <TouchableHighlight
+                underlayColor={Delegate.style.separatorLineColor}
+                onPress={onPressLine}
+            >
+                {this._renderLine()}
+            </TouchableHighlight>
+        ) : this._renderLine();
+    }
+
+    protected _renderLine() {
+        const {title} = this.props;
+        return (
+            <View style={styles.container}>
+                {/* <View style={styles.line}>
+                    
+                </View> */}
+                {this._renderLabel(title)}
+            </View>
+        );
+    }
+
+    protected _renderLabel(title: string) {
+        return (
+            <View style={styles.titleview}>
+                <Text numberOfLines={1} style={styles.title}>
+                    {title}
+                </Text>
+            </View>
+        );
+    }
+}
+
+const styles = StyleSheet.create({
+    container: {
+        flex: 1,
+        flexDirection: 'row',
+        backgroundColor: 'white',
+
+    },
+    line: {
+        height: 48,
+        flex: 1,
+        alignItems: 'center',
+        flexDirection: 'row',
+        backgroundColor: 'white',
+        justifyContent: 'center',
+        paddingHorizontal: 16,
+    },
+
+    titleview: {
+        height: 48,
+        flex: 1,
+        alignItems: 'center',
+        justifyContent: 'center',
+    },
+    title: {
+        fontSize: 16,
+        color: '#333333',
+        textAlign:'center',
+    },
+});
\ No newline at end of file
diff --git a/plugin/setting/AvatarList.tsx b/plugin/setting/AvatarList.tsx
index 0104b67..cd53329 100644
--- a/plugin/setting/AvatarList.tsx
+++ b/plugin/setting/AvatarList.tsx
@@ -21,6 +21,7 @@ export function getUi(props: Typings.Action.Setting.Params): Typings.Action.Sett
             canAdd={isOwner || allowAdd}
             canRemove={isOwner}
             navigation={navigation}
+            tempProps={props}
         />
     );
 }
\ No newline at end of file
diff --git a/plugin/setting/Avoid.tsx b/plugin/setting/Avoid.tsx
index bfed13b..221cd99 100644
--- a/plugin/setting/Avoid.tsx
+++ b/plugin/setting/Avoid.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import Toast from 'react-native-root-toast';
 import i18n from 'i18n-js';
 import { Typings, Delegate } from '../../standard';
+import { APNs } from 'react-native-im-easemob';
 
 export const name = 'IMSettingAvoid';
 
@@ -52,6 +53,9 @@ export class AvoidCell extends React.PureComponent<Props, State> {
         const {imId, chatType} = this.props;
         this.setState({avoid});
         Delegate.model.Conversation.updateConfig(imId, chatType, {avoid})
+            .then(()=> {
+                APNs.ignoreGroupPush(imId, avoid);
+            })
             .catch(() => {
                 Toast.show(i18n.t('IMToastError', {
                     action: i18n.t('IMSettingConfigChange'),
diff --git a/plugin/setting/GeneralUpdate.ts b/plugin/setting/GeneralUpdate.ts
index a1cda5e..4bda973 100644
--- a/plugin/setting/GeneralUpdate.ts
+++ b/plugin/setting/GeneralUpdate.ts
@@ -20,13 +20,10 @@ export async function onAddMembers(props: Typings.Action.Setting.Params,
         const newMembers = [imId, ...memberUserIds];
         try {
             const result = await Delegate.model.Conversation.createOne(newMembers);
-            navigation.navigate({
-                routeName: PageKeys.ChatDetail,
-                params: {
+            navigation.navigate(PageKeys.ChatDetail, {
                     imId: result.imId,
                     chatType: result.chatType,
-                },
-            });
+                });
         } catch (err) {
             Toast.show(i18n.t('IMToastError', {
                 action: i18n.t('IMCreateGroup'),
@@ -47,4 +44,5 @@ export async function onRemoveMembers(props: Typings.Action.Setting.Params,
             action: i18n.t('IMSettingRemoveGroupMember'),
         }));
     }
+    return Delegate.model.Group.getMembers(imId);
 }
\ No newline at end of file
diff --git a/plugin/setting/GroupAnnouncement.tsx b/plugin/setting/GroupAnnouncement.tsx
new file mode 100644
index 0000000..c0c4848
--- /dev/null
+++ b/plugin/setting/GroupAnnouncement.tsx
@@ -0,0 +1,177 @@
+import React from 'react';
+import {
+    Alert,
+    StyleSheet,
+    Text,
+    TouchableHighlight,
+    View
+} from 'react-native';
+import i18n from 'i18n-js';
+import { Typings, Delegate, PageKeys } from '../../standard';
+import delegate from "react-native-im/standard/delegate";
+import ArrowImage from '@hecom/image-arrow';
+
+export const name = 'IMSettingGroupAnnouncement';
+
+export function getUi(props: Typings.Action.Setting.Params): Typings.Action.Setting.Result {
+    const {key, imId, chatType, onDataChange, navigation, onSendMessage} = props;
+    const isGroup = chatType === Typings.Conversation.ChatType.Group;
+    if (!isGroup) {
+        return null;
+    }
+    const groupAnnouncement = Delegate.model.Group.getAnnouncement(imId);
+    const groupOwner = Delegate.model.Group.getOwner(imId);
+    const isOwner = groupOwner === Delegate.user.getMine().userId;
+    return (
+        <GroupAnnouncementCell
+            key={key}
+            isOwner={isOwner}
+            groupAnnouncement={groupAnnouncement}
+            imId={imId}
+            navigation={navigation}
+            onDataChange={onDataChange}
+            onSendMessage={onSendMessage}
+        />
+    );
+}
+
+export interface Props {
+    isOwner: boolean;
+    groupAnnouncement: string | void;
+    imId: string;
+    onDataChange: () => void;
+}
+
+export interface State {
+}
+
+export class GroupAnnouncementCell extends React.PureComponent<Props, State> {
+    state: State = {
+    };
+
+    render() {
+        const {isOwner, groupAnnouncement} = this.props;
+        let title = i18n.t('IMSettingGroupAnnouncement')
+        const hasContent = groupAnnouncement != null && groupAnnouncement.length > 0;
+        let onPressFunc = (isOwner || hasContent) ? this._clickAnnouncement.bind(this) : this._noSetting.bind(this)
+        return (
+            <TouchableHighlight
+                underlayColor={delegate.style.separatorLineColor}
+                onPress={onPressFunc}
+            >
+                <View style={styles.container}>
+                    <View style={styles.line}>
+                        {this._renderLabel(title)}
+                        {hasContent == false && (
+                            <View style={styles.subTitleContainer}>
+                                <Text numberOfLines={1} style={styles.subtitle}>
+                                    {'未设置'}
+                                </Text>
+                            </View>
+                        )}
+                        <ArrowImage />
+                    </View>
+                    {hasContent && this._renderContent(groupAnnouncement)}
+                </View>
+            </TouchableHighlight>
+        );
+    }
+
+    protected _renderLabel(title: string) {
+        return (
+            <View style={styles.titleview}>
+                <Text numberOfLines={1} style={styles.title}>
+                    {title}
+                </Text>
+            </View>
+        );
+    }
+
+    protected _renderContent(text: string) {
+        return (
+            <View style={styles.content}>
+                <Text numberOfLines={2} style={styles.contentText}>
+                    {text}
+                </Text>
+            </View>
+        );
+    }
+
+    protected _clickAnnouncement() {
+        const {imId, onDataChange, isOwner, groupAnnouncement, navigation, onSendMessage} = this.props;
+        const curAnnouncement = (groupAnnouncement != null) ? groupAnnouncement : ''
+
+        navigation.navigate( PageKeys.GroupAnnouncementEdit, {
+            groupId: imId,
+            groupAnnouncement: curAnnouncement,
+            canEdit: isOwner,
+            onDataChange: onDataChange,
+            onSendMessage: onSendMessage,
+        })
+    }
+
+    protected _noSetting() {
+        const {imId} = this.props;
+        const groupOwner = Delegate.model.Group.getOwner(imId);
+        if (groupOwner) {
+            const name = Delegate.user.getUser(groupOwner).name;
+            if (name && name.length > 0) {
+                Alert.alert('', '只有群主' + name +'才能修改群公告', [
+                    {
+                        text: '我知道了',
+                        onPress: () => {},
+                    },
+                ]);
+            }
+        }
+    }
+}
+
+const styles = StyleSheet.create({
+    container: {
+        flex: 1,
+        flexDirection: 'column',
+        backgroundColor: 'white',
+    },
+    line: {
+        height: 48,
+        flex: 1,
+        alignItems: 'center',
+        flexDirection: 'row',
+        backgroundColor: 'white',
+        justifyContent: 'space-between',
+        paddingHorizontal: 16,
+    },
+    subTitleContainer: {
+        flex: 1,
+        flexDirection: 'row',
+        justifyContent: 'flex-end',
+        alignItems: 'center',
+    },
+    content: {
+        flex: 1,
+        flexDirection: 'row',
+        paddingHorizontal: 16,
+        paddingBottom: 10,
+        alignItems: 'center',
+    },
+    titleview: {
+        height: 48,
+        width: 120,
+        flexDirection: 'row',
+        alignItems: 'center',
+    },
+    title: {
+        fontSize: 16,
+        color: '#333333',
+    },
+    subtitle: {
+        fontSize: 14,
+        color: '#aaaaaa',
+        marginHorizontal: 12,
+    },
+    contentText: {
+        fontSize: 14,
+        color: '#aaaaaa',
+    },
+});
diff --git a/plugin/setting/GroupAvatar.tsx b/plugin/setting/GroupAvatar.tsx
index 37fec34..d1f4a89 100644
--- a/plugin/setting/GroupAvatar.tsx
+++ b/plugin/setting/GroupAvatar.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import Toast from 'react-native-root-toast';
 import ActionSheet from 'react-native-general-actionsheet';
-import * as ImagePicker from 'react-native-full-image-picker';
+import * as ImagePicker from '@hecom-rn/react-native-full-image-picker';
 import i18n from 'i18n-js';
 import { Typings, Delegate } from '../../standard';
 
@@ -19,6 +19,9 @@ export function getUi(props: Typings.Action.Setting.Params): Typings.Action.Sett
     };
     const groupOwner = Delegate.model.Group.getOwner(imId);
     const isOwner = groupOwner === Delegate.user.getMine().userId;
+    if (!isOwner) {
+        return null;
+    }
     return (
         <Delegate.component.SettingItem
             key={key}
diff --git a/plugin/setting/GroupData.tsx b/plugin/setting/GroupData.tsx
new file mode 100644
index 0000000..101059c
--- /dev/null
+++ b/plugin/setting/GroupData.tsx
@@ -0,0 +1,63 @@
+import React from 'react';
+import { View } from 'react-native';
+import Toast from 'react-native-root-toast';
+import i18n from 'i18n-js';
+import { Typings, Delegate } from '../../standard';
+
+export const name = 'IMSettingGroupDataInfo';
+
+export function getUi(props: Typings.Action.Setting.Params): Typings.Action.Setting.Result {
+    const {key, imId, chatType} = props;
+    const isGroup = chatType === Typings.Conversation.ChatType.Group;
+    if (!isGroup) {
+        return null;
+    }
+    const groupName = Delegate.model.Group.getName(imId, false);
+    const groupOwner = Delegate.model.Group.getOwner(imId);
+    const isOwner = groupOwner === Delegate.user.getMine().userId;
+    return (
+        <GroupDataInfoCell
+            key={key}
+            isOwner={isOwner}
+            groupName={groupName}
+            imId={imId}
+        />
+    );
+}
+
+export interface Props {
+    isOwner: boolean;
+    groupName: string | void;
+    imId: string;
+}
+
+export interface State {
+}
+
+export class GroupDataInfoCell extends React.PureComponent<Props,State> {
+    state: State = {
+    };
+
+    render() {
+        return (
+            <View>
+                <Delegate.component.SettingItem
+                    type={Typings.Component.SettingItemType.Text}
+                    title={i18n.t('IMSettingGroupDataInfo')}
+                    data={""}
+                    onPressLine={this._clickLine.bind(this)}
+                />
+            </View>
+        );
+    }
+    
+    protected _clickLine() {
+        const {imId} = this.props;
+        Delegate.model.Group.showGroupDataRecord(imId)
+            .catch(() => {
+                Toast.show(i18n.t('IMToastError', {
+                    action: i18n.t('IMSettingGroupDataInfo'),
+                }));
+            });
+    }
+}
\ No newline at end of file
diff --git a/plugin/setting/GroupName.tsx b/plugin/setting/GroupName.tsx
index ca8760a..f736ee8 100644
--- a/plugin/setting/GroupName.tsx
+++ b/plugin/setting/GroupName.tsx
@@ -2,13 +2,13 @@ import React from 'react';
 import { View } from 'react-native';
 import Toast from 'react-native-root-toast';
 import i18n from 'i18n-js';
-import { Typings, Delegate } from '../../standard';
+import { Typings, Delegate, PageKeys } from '../../standard';
 import Prompt from './Prompt';
 
 export const name = 'IMSettingGroupName';
 
 export function getUi(props: Typings.Action.Setting.Params): Typings.Action.Setting.Result {
-    const {key, imId, chatType, onDataChange} = props;
+    const {key, imId, chatType, onDataChange,navigation} = props;
     const isGroup = chatType === Typings.Conversation.ChatType.Group;
     if (!isGroup) {
         return null;
@@ -16,12 +16,16 @@ export function getUi(props: Typings.Action.Setting.Params): Typings.Action.Sett
     const groupName = Delegate.model.Group.getName(imId, false);
     const groupOwner = Delegate.model.Group.getOwner(imId);
     const isOwner = groupOwner === Delegate.user.getMine().userId;
+    if (!isOwner) {
+        return null;
+    }
     return (
         <GroupNameCell
             key={key}
             isOwner={isOwner}
             groupName={groupName}
             imId={imId}
+            navigation={navigation}
             onDataChange={onDataChange}
         />
     );
@@ -45,7 +49,7 @@ export class GroupNameCell extends React.PureComponent<Props, State> {
 
     render() {
         const {groupName, isOwner} = this.props;
-        const showNameLineFunc = !isOwner ? undefined : this._changePromptStatus.bind(this, true);
+        const showNameLineFunc = !isOwner ? undefined : this._clickNameEdit.bind(this);
         return (
             <View>
                 <Delegate.component.SettingItem
@@ -54,13 +58,13 @@ export class GroupNameCell extends React.PureComponent<Props, State> {
                     data={groupName}
                     onPressLine={showNameLineFunc}
                 />
-                <Prompt
+                {/* <Prompt
                     visible={this.state.showPrompt}
                     title={i18n.t('IMSettingGroupNameChangeTips')}
                     onCancel={this._changePromptStatus.bind(this, false)}
                     onSubmit={this._clickName.bind(this)}
                     textInputProps={{secureTextEntry: false}}
-                />
+                /> */}
             </View>
         );
     }
@@ -86,4 +90,18 @@ export class GroupNameCell extends React.PureComponent<Props, State> {
                 }));
             });
     }
+
+    protected _clickNameEdit() {
+        const {imId, onDataChange, groupName, navigation, onSendMessage} = this.props;
+        const curGroupName = (groupName != null) ? groupName : ''
+        const groupAvatar = { imId: imId, chatType:Typings.Conversation.ChatType.Group };
+
+        navigation.navigate( PageKeys.GroupNameEdit, {
+            groupId: imId,
+            groupName: curGroupName,
+            groupAvatar: groupAvatar,
+            onDataChange: onDataChange,
+            onSendMessage: onSendMessage,
+        })
+    }
 }
\ No newline at end of file
diff --git a/plugin/setting/LeaveGroup.tsx b/plugin/setting/LeaveGroup.tsx
index 4b13b30..2080553 100644
--- a/plugin/setting/LeaveGroup.tsx
+++ b/plugin/setting/LeaveGroup.tsx
@@ -1,8 +1,9 @@
-import { StackActions } from 'react-navigation';
+import { StackActions } from '@react-navigation/native';
 import Toast from 'react-native-root-toast';
 import i18n from 'i18n-js';
 import { Typings, Delegate } from '../../standard';
 import getGeneralButton from './GeneralButton';
+import { Alert } from 'react-native';
 
 export const name = 'IMSettingLeaveGroup';
 
@@ -23,17 +24,58 @@ async function _clickLeave(
     text: string,
     isOwner: boolean
 ): Promise<void> {
-    const {imId, navigation} = props;
     try {
+        // dismissGroup, need confirm again
         if (isOwner) {
-            await Delegate.model.Group.destroyOne(imId);
+            Alert.alert('提示','是否' + i18n.t('IMSettingLeaveGroupDestroy') + '?', [
+                {
+                    text: '取消',
+                    onPress: () => {},
+                },
+                {
+                    text: '确定',
+                    onPress: () => {
+                        leaveDidTrue(props,text,isOwner);
+                    },
+                },
+            ]);
         } else {
-            await Delegate.model.Group.quitOne(imId);
+            Alert.alert('提示','删除并退出后，将不再接收此群聊信息！', [
+                {
+                    text: '取消',
+                    onPress: () => {},
+                },
+                {
+                    text: '确定',
+                    onPress: () => {
+                        leaveDidTrue(props,text,isOwner);
+                    },
+                },
+            ]);
         }
-        Toast.show(i18n.t('IMToastSuccess', {action: text}));
-        const action = StackActions.pop({n: 2});
-        navigation.dispatch(action);
     } catch (err) {
         Toast.show(i18n.t('IMToastError', {action: text}));
     }
+}
+
+async function leaveDidTrue(
+    props: Typings.Action.Setting.Params,
+    text: string,
+    isOwner: boolean) {
+
+    const {imId, navigation} = props;
+
+    const action = StackActions.pop(2);
+    navigation.dispatch(action);
+    await new Promise<void>((resolve) => {
+        setTimeout(() => {
+        resolve()
+         }, 50);
+       });
+    if (isOwner) {
+        await Delegate.model.Group.destroyOne(imId);
+    } else {
+        await Delegate.model.Group.quitOne(imId);
+     }
+    Toast.show(i18n.t('IMToastSuccess', {action: text}));
 }
\ No newline at end of file
diff --git a/plugin/setting/Prompt.tsx b/plugin/setting/Prompt.tsx
index 5369ead..35d29ee 100644
--- a/plugin/setting/Prompt.tsx
+++ b/plugin/setting/Prompt.tsx
@@ -1,8 +1,10 @@
 import React from 'react';
-import { TextInput, StyleSheet, Dimensions, TextInputProps } from 'react-native';
-import Dialog, { DialogTitle, DialogButton, DialogContent } from 'react-native-popup-dialog';
+import { TextInput, StyleSheet, Dimensions, TextInputProps, Keyboard, Platform } from 'react-native';
+import Modal, { ModalTitle, ModalButton, ModalContent, ModalFooter} from 'react-native-modals';
 import i18n from 'i18n-js';
 
+const isAndroid = Platform.OS === 'android';
+
 export interface Props {
     visible: boolean;
     title: string;
@@ -13,12 +15,16 @@ export interface Props {
 
 export interface State {
     text: string;
+    keyBoardShow: boolean
 }
 
 export default class extends React.PureComponent<Props, State> {
     state: State = {
         text: '',
+        keyBoardShow: false
     };
+    keyboardDidShowListener: any;
+    keyboardDidHideListener: any;
 
     constructor(props: Props) {
         super(props);
@@ -27,60 +33,75 @@ export default class extends React.PureComponent<Props, State> {
 
     componentDidMount() {
         Dimensions.addEventListener('change', this._onOrientationChange);
+        this.keyboardDidShowListener = Keyboard.addListener('keyboardDidShow', this._keyboardDidShow.bind(this));
+        this.keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', this._keyboardDidHide.bind(this));
     }
 
     componentWillUnmount() {
         Dimensions.removeEventListener('change', this._onOrientationChange);
+        this.keyboardDidShowListener.remove();
+        this.keyboardDidHideListener.remove();
+    }
+
+    _keyboardDidShow(e: any) {
+        this.setState({
+            keyBoardShow: true
+        });
+    }
+    _keyboardDidHide() {
+        this.setState({
+            keyBoardShow: false
+        });
     }
 
     render() {
         const {visible, onCancel, onSubmit, textInputProps} = this.props;
         const {width, height} = Dimensions.get('window');
-        const isLandscape = width > height;
-        const marginTop = isLandscape ? 15 : height * 0.1;
         const dialogWidth = Math.min(width - 15 * 2, 300);
+        const marginStyle = isAndroid ? {} : {marginBottom: this.state.keyBoardShow ? height / 2 : 0};
         return (
-            <Dialog
+            <Modal
                 visible={visible}
                 onTouchOutside={onCancel}
-                dialogTitle={this._renderPromptTitle()}
+                modalTitle={this._renderPromptTitle()}
                 width={dialogWidth}
-                dialogStyle={[styles.dialog, {marginTop}]}
+                modalStyle={[styles.dialog, marginStyle]}
                 containerStyle={styles.container}
-                actionContainerStyle={styles.footer}
-                actions={[
-                    <DialogButton
-                        key={'cancel'}
-                        text={i18n.t('IMCommonCancel')}
-                        onPress={onCancel}
-                        style={styles.action}
-                        textStyle={styles.actionText}
-                    />,
-                    <DialogButton
-                        key={'ok'}
-                        text={i18n.t('IMCommonOK')}
-                        onPress={() => onSubmit(this.state.text)}
-                        style={styles.action}
-                        textStyle={styles.actionText}
-                    />
-                ]}
+                footer={
+                    <ModalFooter style={styles.footer}>
+                        <ModalButton
+                            key={'cancel'}
+                            text={i18n.t('IMCommonCancel')}
+                            onPress={onCancel}
+                            style={styles.action}
+                            textStyle={styles.actionText}
+                        />
+                        <ModalButton
+                            key={'ok'}
+                            text={i18n.t('IMCommonOK')}
+                            onPress={() => onSubmit(this.state.text)}
+                            style={styles.action}
+                            textStyle={styles.actionText}
+                        />
+                    </ModalFooter>
+                }
             >
-                <DialogContent style={styles.content}>
+                <ModalContent style={styles.content}>
                     <TextInput
                         style={styles.input}
                         onChangeText={(text) => this.setState({text})}
                         autoFocus={true}
                         {...textInputProps}
                     />
-                </DialogContent>
-            </Dialog>
+                </ModalContent>
+            </Modal>
         );
     }
     
     protected _renderPromptTitle() {
         const {title} = this.props;
         return (
-            <DialogTitle
+            <ModalTitle
                 title={title}
                 style={styles.title}
                 textStyle={styles.titleText}
@@ -128,7 +149,6 @@ const styles = StyleSheet.create({
         borderTopWidth: StyleSheet.hairlineWidth,
         borderTopColor: '#e6e6ea',
         flexDirection: 'row',
-        marginTop: 20,
         borderColor: '#cccccc',
     },
     action: {
diff --git a/plugin/setting/TransferOwner.tsx b/plugin/setting/TransferOwner.tsx
index b90cb90..0d16858 100644
--- a/plugin/setting/TransferOwner.tsx
+++ b/plugin/setting/TransferOwner.tsx
@@ -27,16 +27,13 @@ function _clickTransferOwner(props: Typings.Action.Setting.Params) {
     const dataSource = groupMembers
         .filter(userId => userId !== myUserId)
         .map(userId => Delegate.user.getUser(userId));
-    navigation.navigate({
-        routeName: PageKeys.ChooseUser,
-        params: {
+    navigation.navigate(PageKeys.ChooseUser,{
             title: i18n.t('IMSettingChooseGroupMember'),
             multiple: false,
             dataSource: dataSource,
             onSelectData: (data: string[]) => _onTransferOwnerAlert(props, data),
             selectedIds: [],
-        },
-    });
+        });
 }
 
 function _onTransferOwnerAlert(props: Typings.Action.Setting.Params, data: string[]) {
diff --git a/plugin/setting/index.ts b/plugin/setting/index.ts
index 41b0f09..b48b8c7 100644
--- a/plugin/setting/index.ts
+++ b/plugin/setting/index.ts
@@ -6,6 +6,8 @@ import * as Avoid from './Avoid';
 import * as GroupAvatar from './GroupAvatar';
 import * as GroupMemberName from './GroupMemberName';
 import * as GroupName from './GroupName';
+import * as GroupAnnouncement from './GroupAnnouncement';
+import * as GroupData from './GroupData';
 import * as LeaveGroup from './LeaveGroup';
 import * as Top from './Top';
 import * as TransferOwner from './TransferOwner';
@@ -18,23 +20,25 @@ export function setup() {
         (props: Typings.Action.Setting.Params) => Typings.Action.Setting.Result
     ];
     const actions: ActionItem[] = [
-        [AllMembers.name, AllMembers.getUi],
         [AllowInvite.name, AllowInvite.getUi],
         [AvatarList.name, AvatarList.getUi],
         [Avoid.name, Avoid.getUi],
+        [GroupData.name,GroupData.getUi],
         [GroupAvatar.name, GroupAvatar.getUi],
         [GroupMemberName.name, GroupMemberName.getUi],
         [GroupName.name, GroupName.getUi],
         [LeaveGroup.name, LeaveGroup.getUi],
         [Top.name, Top.getUi],
         [TransferOwner.name, TransferOwner.getUi],
+        [GroupAnnouncement.name, GroupAnnouncement.getUi],
     ];
     actions.forEach(function ([name, getUi]) {
         Model.Setting.registerDefault(name, getUi);
     });
     Delegate.page[PageKeys.ChatSetting].defaultProps.sections = [
-        [AvatarList.name, AllMembers.name],
-        [GroupName.name, GroupAvatar.name, AllowInvite.name, Top.name, Avoid.name, GroupMemberName.name]
+        [AvatarList.name],
+        [GroupData.name],
+        [GroupName.name, GroupAvatar.name, GroupAnnouncement.name, AllowInvite.name, Top.name, Avoid.name, GroupMemberName.name]
     ];
     Delegate.page[PageKeys.ChatSetting].defaultProps.buttons = [
         LeaveGroup.name,
@@ -47,11 +51,13 @@ export {
     AllowInvite,
     AvatarList,
     Avoid,
+    GroupData,
     GroupAvatar,
     GroupName,
+    GroupAnnouncement,
     LeaveGroup,
     Top,
     TransferOwner,
     getGeneralButton,
     Prompt,
-};
\ No newline at end of file
+};
diff --git a/standard/component/AvatarList.tsx b/standard/component/AvatarList.tsx
index 7bef077..3734801 100644
--- a/standard/component/AvatarList.tsx
+++ b/standard/component/AvatarList.tsx
@@ -1,10 +1,11 @@
 import React from 'react';
 import { View, StyleSheet, Text, Image, TouchableOpacity, Dimensions } from 'react-native';
-import { getSafeAreaInset } from 'react-native-pure-navigation-bar';
+import { getSafeAreaInset } from '@hecom/react-native-pure-navigation-bar';
 import i18n from 'i18n-js';
 import { Component } from '../typings';
 import * as PageKeys from '../pagekey';
 import delegate from '../delegate';
+import { AllMembers } from 'react-native-im/plugin/setting';
 
 export type Props = Component.AvatarListProps;
 
@@ -14,7 +15,7 @@ export default class extends React.PureComponent<Props> {
     protected readonly padding = 16;
     protected readonly itemEdge = 50;
     protected itemMargin = 0;
-    
+
     constructor(props: Props) {
         super(props);
         this._onOrientationChange = this._onOrientationChange.bind(this);
@@ -30,9 +31,11 @@ export default class extends React.PureComponent<Props> {
 
     render() {
         const dataSource = this._getDataSource();
+        const {tempProps} = this.props;
         return (
             <View>
                 {dataSource.map(this._renderRow.bind(this))}
+                {AllMembers.getUi(tempProps)}
             </View>
         );
     }
@@ -104,7 +107,7 @@ export default class extends React.PureComponent<Props> {
 
     protected _getDataSource(): string[][] {
         const column = this._calculateColumn();
-        const maxRow = 3;
+        const maxRow = 6;
         const {canAdd, canRemove, data} = this.props;
         const showCount = column * maxRow - (canAdd ? 1 : 0) - (canRemove ? 1 : 0);
         const newData = [...data.slice(0, showCount)];
@@ -145,30 +148,25 @@ export default class extends React.PureComponent<Props> {
 
     protected _onItemPress(rowItem: string) {
         if (rowItem === this.add) {
-            this.props.navigation.navigate({
-                routeName: PageKeys.ChooseUser,
-                params: {
+            this.props.navigation.navigate(PageKeys.ChooseUser,{
                     title: i18n.t('IMSettingChooseGroupMember'),
                     multiple: true,
                     onSelectData: this.props.onAddMembers,
                     selectedIds: [],
                     excludedUserIds: this.props.data,
-                },
-            });
+                });
         } else if (rowItem === this.remove) {
             const dataSource = this.props.data
                 .filter(item => item !== this.props.owner)
                 .map(item => delegate.user.getUser(item));
-            this.props.navigation.navigate({
-                routeName: PageKeys.ChooseUser,
-                params: {
+            this.props.navigation.navigate(PageKeys.ChooseUser,{
                     title: i18n.t('IMSettingChooseGroupMember'),
                     multiple: true,
                     onSelectData: this.props.onRemoveMembers,
                     selectedIds: [],
                     dataSource: dataSource,
-                },
-            });
+		            hideRecentlyPerson: true
+                });
         } else {
             delegate.func.pushToUserDetailPage(rowItem);
         }
@@ -192,4 +190,4 @@ const styles = StyleSheet.create({
         top: 0,
         left: 0,
     },
-});
\ No newline at end of file
+});
diff --git a/standard/component/BaseMessage.tsx b/standard/component/BaseMessage.tsx
index d25d694..8c3449f 100644
--- a/standard/component/BaseMessage.tsx
+++ b/standard/component/BaseMessage.tsx
@@ -1,11 +1,24 @@
 import React from 'react';
-import {ActivityIndicator, Image, ImageStyle, StyleSheet, Text, TouchableWithoutFeedback, View} from 'react-native';
-import Listener, {ListenerObjType} from 'react-native-general-listener';
+import {
+    ActivityIndicator,
+    EmitterSubscription,
+    Image,
+    ImageStyle,
+    StyleSheet,
+    Text,
+    TouchableWithoutFeedback,
+    View
+} from 'react-native';
+import Listener from '@hecom/listener';
 import Toast from 'react-native-root-toast';
 import {Component, Event, Message} from '../typings';
 import delegate from '../delegate';
+import { DateUtil } from '../util';
+import { Icon } from 'core/common';
+import HecomModel from 'core/model';
 
 export type Props = Component.BaseMessageProps;
+export type ListenerObjType = EmitterSubscription;
 
 export interface State {
     showMembersName: boolean;
@@ -32,7 +45,7 @@ export default class extends React.PureComponent<Props, State> {
     }
 
     render() {
-        const {position} = this.props;
+        const {position, showTime} = this.props;
         let msgContent = null;
         if (position < 0) {
             msgContent = this._renderLeft();
@@ -43,47 +56,69 @@ export default class extends React.PureComponent<Props, State> {
         }
         return (
             <View style={styles.message}>
+                {!!showTime && position !== 0 && this._renderTime()}
                 {msgContent}
             </View>
         );
     }
 
+    protected _renderTime() {
+        const {message: {timestamp}} = this.props;
+        return (
+            <Text style={[styles.center, {marginBottom: 18}]}>
+                {DateUtil.showDateTime(timestamp, true)}
+            </Text>
+        );
+    }
+
     protected _renderLeft() {
-        const {message, onShowMenu, messages} = this.props;
+        const { message, onShowMenu, messages, hasCheckBox, isSelected, changeSelectState } = this.props;
         const user = delegate.user.getUser(message.from);
         return (
-            <View style={styles.rowLeft}>
-                {this._renderAvatar(styles.avatarLeft)}
-                <View>
-                    {this.state.showMembersName && (
-                        <Text style={styles.userName}>
-                            {user.name}
-                        </Text>
-                    )}
-                    <delegate.component.MessageBubble
-                        imId={this.props.imId}
-                        chatType={this.props.chatType}
-                        isSender={false}
-                        message={message}
-                        messages={messages}
-                        onShowMenu={onShowMenu}
-                        navigation={this.props.navigation}
-                    />
+            <TouchableWithoutFeedback disabled={!hasCheckBox} onPress={()=>changeSelectState(isSelected,message)}>
+                <View style={styles.rowLeft}>
+                    {(hasCheckBox && (
+                        <Icon
+                            name={isSelected ? 'e66d' : 'e66f'}
+                            size={18}
+                            style={{
+                                color: HecomModel.entConfig.getThemeColor('#ef4140') as string
+                            }}
+                        />
+                    ))}
+                    {this._renderAvatar(styles.avatarLeft, hasCheckBox)}
+                    <View>
+                        {this.state.showMembersName && (
+                            <Text style={styles.userName}>
+                                {user.name}
+                            </Text>
+                        )}
+                        <delegate.component.MessageBubble
+                            imId={this.props.imId}
+                            chatType={this.props.chatType}
+                            isSender={false}
+                            message={message}
+                            messages={messages}
+                            onShowMenu={onShowMenu}
+                            touchable={hasCheckBox}
+                            navigation={this.props.navigation}
+                        />
+                    </View>
                 </View>
-            </View>
+            </TouchableWithoutFeedback>
         );
     }
 
     protected _renderRight() {
-        const {message, onShowMenu, messages} = this.props;
+        const { message, onShowMenu, messages, hasCheckBox, isSelected, changeSelectState } = this.props;
         const status = message.status;
         let leftItem = null;
         if (status === Message.Status.Delivering ||
             status === Message.Status.Pending) {
             leftItem = (
                 <ActivityIndicator
-                    size='small'
-                    color='#999999'
+                    size="small"
+                    color="#999999"
                 />
             );
         } else if (status === Message.Status.Failed) {
@@ -97,19 +132,33 @@ export default class extends React.PureComponent<Props, State> {
             );
         }
         return (
-            <View style={styles.rowRight}>
-                {leftItem}
-                <delegate.component.MessageBubble
-                    imId={this.props.imId}
-                    chatType={this.props.chatType}
-                    isSender={true}
-                    message={message}
-                    messages={messages}
-                    onShowMenu={onShowMenu}
-                    navigation={this.props.navigation}
-                />
-                {this._renderAvatar(styles.avatarRight)}
-            </View>
+            <TouchableWithoutFeedback disabled={!hasCheckBox} onPress={()=>changeSelectState(isSelected,message)}>
+                <View style={styles.rowLeft}>
+                    {(hasCheckBox && (
+                        <Icon
+                            name={isSelected ? 'e66d' : 'e66f'}
+                            size={18}
+                            style={{
+                                color: HecomModel.entConfig.getThemeColor('#ef4140') as string
+                            }}
+                        />
+                    ))}
+                    <View style={styles.rowRight}>
+                        {leftItem}
+                        <delegate.component.MessageBubble
+                            imId={this.props.imId}
+                            chatType={this.props.chatType}
+                            isSender={true}
+                            message={message}
+                            messages={messages}
+                            onShowMenu={onShowMenu}
+                            touchable={hasCheckBox}
+                            navigation={this.props.navigation}
+                        />
+                        {this._renderAvatar(styles.avatarRight, hasCheckBox)}
+                    </View>
+                </View>
+            </TouchableWithoutFeedback>
         );
     }
 
@@ -122,8 +171,8 @@ export default class extends React.PureComponent<Props, State> {
         );
     }
 
-    protected _renderAvatar(style: ImageStyle) {
-        const {position, message} = this.props;
+    protected _renderAvatar(style: ImageStyle, touchable: boolean) {
+        const { position, message } = this.props;
         const user = position < 0 ?
             delegate.user.getUser(message.from) :
             delegate.user.getMine();
@@ -139,7 +188,11 @@ export default class extends React.PureComponent<Props, State> {
             ? {uri: delegate.func.fitUrlForAvatarSize(avatar, size)}
             : defaultImage;
         return (
-            <TouchableWithoutFeedback onPress={() => delegate.func.pushToUserDetailPage(imId)}>
+            <TouchableWithoutFeedback
+                disabled={touchable}
+                onPress={() => delegate.func.pushToUserDetailPage(imId)}
+                onLongPress={() => this.props.onLongPressAvatar && this.props.onLongPressAvatar(this.props.message)}
+            >
                 <Image
                     style={[styles.userImage, innerStyle, style]}
                     source={image}
@@ -209,4 +262,4 @@ const styles = StyleSheet.create({
         width: 20,
         height: 20,
     },
-});
\ No newline at end of file
+});
diff --git a/standard/component/BottomBar.tsx b/standard/component/BottomBar.tsx
index e5b2744..f00efdd 100644
--- a/standard/component/BottomBar.tsx
+++ b/standard/component/BottomBar.tsx
@@ -1,12 +1,33 @@
+import {getSafeAreaInset} from '@hecom/react-native-pure-navigation-bar';
+import i18n from 'i18n-js';
 import React from 'react';
-import { Image, Keyboard, PermissionsAndroid, Platform, SafeAreaView, StyleSheet, Text, TextInput, TouchableHighlight, TouchableOpacity, View, EmitterSubscription, TextStyle, NativeSyntheticEvent, TextInputSelectionChangeEventData, TextInputKeyPressEventData, KeyboardEvent } from 'react-native';
-import SoundRecorder from 'react-native-sound-recorder';
+import {
+    EmitterSubscription,
+    Image,
+    Keyboard,
+    KeyboardEvent,
+    NativeSyntheticEvent,
+    PermissionsAndroid,
+    Platform,
+    SafeAreaView,
+    StyleSheet,
+    Text,
+    TextInput,
+    TextInputKeyPressEventData,
+    TextInputSelectionChangeEventData,
+    TextStyle,
+    TouchableHighlight,
+    TouchableOpacity,
+    TouchableWithoutFeedback,
+    View
+} from 'react-native';
 import Toast from 'react-native-root-toast';
-import { getSafeAreaInset } from 'react-native-pure-navigation-bar';
-import i18n from 'i18n-js';
-import { Component, Contact, Message, Conversation } from '../typings';
-import * as PageKeys from '../pagekey';
+import SoundRecorder from 'react-native-sound-recorder';
 import delegate from '../delegate';
+import * as PageKeys from '../pagekey';
+import {Component, Contact, Conversation, Message} from '../typings';
+import {IMConstant} from 'react-native-im-easemob';
+import {check, PERMISSIONS, request, RESULTS} from 'react-native-permissions';
 
 export type Props = Component.BottomBarProps;
 
@@ -17,6 +38,8 @@ export interface State {
     showMoreBoard: boolean;
     showSpeech: boolean;
     isRecording: boolean;
+    showQuote: boolean;
+    quoteMsg: Message.General | undefined;
 }
 
 export default class extends React.PureComponent<Props, State> {
@@ -29,7 +52,8 @@ export default class extends React.PureComponent<Props, State> {
     protected listenKeyboardShow: EmitterSubscription | void = null;
     protected listenKeyboardHide: EmitterSubscription | void = null;
     protected textInput: TextInput | null = null;
-    
+
+
     state = {
         message: '',
         keyboardHeight: 0,
@@ -37,6 +61,8 @@ export default class extends React.PureComponent<Props, State> {
         showMoreBoard: false,
         showSpeech: false,
         isRecording: false,
+        showQuote: true,
+        quoteMsg: undefined,
     };
 
     componentDidMount() {
@@ -50,11 +76,22 @@ export default class extends React.PureComponent<Props, State> {
     }
 
     render() {
-        return (
+        const { batchOptionMode, onBatchForward } = this.props;
+        return batchOptionMode ? (
             <SafeAreaView style={styles.safeview}>
+                <TouchableWithoutFeedback onPress={()=>onBatchForward()}>
+                    <View style={styles.container}>
+                        <Text style={styles.btnText}>转发</Text>
+                    </View>
+                </TouchableWithoutFeedback>
+            </SafeAreaView>
+        ) : (<SafeAreaView style={styles.safeview}>
                 <View style={styles.container}>
                     {this._renderLeftBtn()}
-                    {this._renderInputView()}
+                    <View style={styles.msgContainer}>
+                        {this._renderInputView()}
+                        {this._renderQuoteView()}
+                    </View>
                     {this._renderRightBtn()}
                 </View>
                 {this._renderBottomView()}
@@ -70,9 +107,16 @@ export default class extends React.PureComponent<Props, State> {
         });
     }
 
+    public quoteMsg(msg: Message.General) {
+        this.setState({
+            quoteMsg: msg,
+        });
+        this.textInput && this.textInput.focus();
+    }
+
     public changeInputText(imId: string, text: string) {
         const user = delegate.user.getUser(imId);
-        const newText = '@' + user.name + ' : "' + text + '"\n' + '-----\n' + delegate.user.getMine().name + ': ';
+        const newText = '@' + user.name + ' ';
         this.setState({
             message: newText,
         });
@@ -80,6 +124,15 @@ export default class extends React.PureComponent<Props, State> {
         this.textInput && this.textInput.focus();
     }
 
+    public insertAtMember(userId: string) {
+        const text = this.state.message;
+        const newText = text.slice(0, this.textLocation) + '@' + text.slice(this.textLocation);;
+        this.setState({ message: newText }, () => {
+            this.textLocation++;
+            this._onSelectData([userId]);
+        });
+    }
+
     protected _renderLeftBtn() {
         const icon = this.state.showSpeech ?
             require('./image/chat_keyboard.png') :
@@ -115,21 +168,72 @@ export default class extends React.PureComponent<Props, State> {
                         autoCorrect={false}
                     />
                 ) : (
-                    <TouchableHighlight
-                        underlayColor={'#d7d8d8'}
-                        onPressIn={this._onStartRecording.bind(this)}
-                        onPressOut={this._onEndRecording.bind(this)}
-                    >
-                        <View style={styles.sound}>
-                            <Text style={styles.soundText}>
-                                {this.state.isRecording ? i18n.t('IMComponentBottomBarVoiceRelease') : i18n.t('IMComponentBottomBarVoicePress')}
-                            </Text>
-                        </View>
-                    </TouchableHighlight>
-                )}
+                        <TouchableHighlight
+                            underlayColor={'#d7d8d8'}
+                            onPressIn={this._onStartRecording.bind(this)}
+                            onPressOut={this._onEndRecording.bind(this)}
+                        >
+                            <View style={styles.sound}>
+                                <Text style={styles.soundText}>
+                                    {this.state.isRecording ? i18n.t('IMComponentBottomBarVoiceRelease') : i18n.t('IMComponentBottomBarVoicePress')}
+                                </Text>
+                            </View>
+                        </TouchableHighlight>
+                    )}
             </View>
         );
     }
+    protected _renderQuoteView() {
+        if(this.state.showSpeech ){
+            return;
+        }
+        let quoteMsg: Message.General | undefined = this.state.quoteMsg;
+        var msgDesc: String = '';
+        if (quoteMsg != undefined) {
+            switch (quoteMsg.type) {
+                case IMConstant.MessageType.text:
+                    msgDesc = (quoteMsg as Message.General).data.text;
+                    break;
+                case IMConstant.MessageType.image:
+                    msgDesc='[图片]';
+                    break;
+                case IMConstant.MessageType.video:
+                    msgDesc='[视频]';
+                    break;
+                case IMConstant.MessageType.location:
+                    msgDesc='[位置]';
+                    break;
+                case IMConstant.MessageType.file:
+                    msgDesc='[文件]';
+                    break;
+                case IMConstant.MessageType.material:
+                    msgDesc='[资料]';
+                    break;
+            }
+        }
+        return quoteMsg ?
+            (<View style={styles.quoteTextBorder}>
+                <Text
+                    numberOfLines={1}
+                    ellipsizeMode={'tail'}
+                    style={styles.quoteText} >
+                    {/* {delegate.user.getUser('test__c_v2011_1122225706').name + ':'} */}
+
+                    {delegate.user.getUser((quoteMsg as Message.General).from).name + ':' +msgDesc}
+                </Text>
+                <TouchableOpacity
+                    activeOpacity={0.5}
+                    onPress={this._onQuoteMsgDel.bind(this)}
+                    style={[styles.delIconTouch]}
+                >
+                    <Image
+                        source={require('./image/clear.png')}
+                        style={styles.delIcon}
+                    />
+                </TouchableOpacity>
+            </View>)
+            : undefined
+    }
 
     protected _renderRightBtn() {
         const firstIcon = this.state.showEmojiView ?
@@ -187,7 +291,7 @@ export default class extends React.PureComponent<Props, State> {
         } else if (this.state.showMoreBoard) {
             return <delegate.component.MoreBoard {...this.props} />;
         } else {
-            return <View style={{height: this.state.keyboardHeight}} />;
+            return <View style={{ height: this.state.keyboardHeight }} />;
         }
     }
 
@@ -198,7 +302,7 @@ export default class extends React.PureComponent<Props, State> {
             atMemberList = Message.AtAll;
         } else {
             const memberMap = this.atMemberList
-                .reduce((prv: {[key: string]: Contact.User}, cur: Contact.User) => {
+                .reduce((prv: { [key: string]: Contact.User }, cur: Contact.User) => {
                     if (!prv[cur.userId]) {
                         prv[cur.userId] = cur;
                     }
@@ -211,15 +315,16 @@ export default class extends React.PureComponent<Props, State> {
             body: {
                 text: this.state.message,
                 atMemberList: atMemberList,
+                quoteMsg:this.state.quoteMsg,
             },
         };
         this.props.onSendMessage(message);
-        this.setState({message: ''});
+        this.setState({ message: '', quoteMsg: undefined });
         this.atMemberList = [];
     }
 
     protected _onStartRecording() {
-        this.setState({isRecording: true});
+        this.setState({ isRecording: true });
         const option = !this.isIos ? {
             format: SoundRecorder.FORMAT_AAC_ADTS,
             encoder: SoundRecorder.ENCODER_AAC
@@ -230,8 +335,8 @@ export default class extends React.PureComponent<Props, State> {
     }
 
     protected _onEndRecording() {
-        this.setState({isRecording: false});
-        const {onSendMessage} = this.props;
+        this.setState({ isRecording: false });
+        const { onSendMessage } = this.props;
         SoundRecorder.stop()
             .then((result) => {
                 const time = Math.floor(result.duration / 1000);
@@ -270,7 +375,7 @@ export default class extends React.PureComponent<Props, State> {
             this.selectedEmojiArr.push(text);
             message = this.state.message + text;
         }
-        this.setState({message});
+        this.setState({ message });
     }
 
     protected _onChangeText(text: string) {
@@ -295,41 +400,48 @@ export default class extends React.PureComponent<Props, State> {
                 }
             }
         }
-        this.setState({message: newText});
+        this.setState({ message: newText });
     }
 
     protected _onSelectData(data: string[]) {
-        const item = delegate.user.getUser(data[0]);
+        const dataFirst = data[0];
+        let item = {};
+        if (dataFirst === Message.AtAll) {
+            item.imId = Message.AtAll;
+            item.name = i18n.t('IMPageChooseUserAll');
+        } else {
+            item = delegate.user.getUser(data[0]);
+        }
         const text = this.state.message;
         const newText = text.slice(0, this.textLocation) + item.name + ' ' + text.slice(this.textLocation);
-        this.setState({message: newText});
+        this.setState({ message: newText });
         this.atMemberList.push(item);
         this.textInput && this.textInput.focus();
     }
 
     protected _onSelectionChange(event: NativeSyntheticEvent<TextInputSelectionChangeEventData>) {
-        const {nativeEvent: {selection: {start, end}}} = event;
+        const { nativeEvent: { selection: { start, end } } } = event;
         if (start === end) {
             this.textLocation = start;
         }
     }
 
     protected _onKeyPress(event: NativeSyntheticEvent<TextInputKeyPressEventData>) {
-        const {nativeEvent: {key}} = event;
+        const { nativeEvent: { key } } = event;
         if (key === '@' && this.props.chatType === Conversation.ChatType.Group) {
             const members = delegate.model.Group.getMembers(this.props.imId);
             const dataSource = members
                 .filter(userId => userId !== delegate.user.getMine().userId)
                 .map(userId => delegate.user.getUser(userId));
-            this.props.navigation.navigate({
-                routeName: PageKeys.ChooseUser,
-                params: {
-                    title: i18n.t('IMComponentBottomBarChooseAtPerson'),
-                    multiple: false,
-                    onSelectData: this._onSelectData.bind(this),
-                    selectedIds: [],
-                    dataSource: dataSource,
-                },
+            const groupOwner = delegate.model.Group.getOwner(this.props.imId);
+            const isOwner = groupOwner === delegate.user.getMine().userId;
+            this.props.navigation.navigate(PageKeys.ChooseUser, {
+                title: i18n.t('IMComponentBottomBarChooseAtPerson'),
+                multiple: false,
+                onSelectData: this._onSelectData.bind(this),
+                selectedIds: [],
+                dataSource: dataSource,
+                showAtAll: isOwner,
             });
         }
     }
@@ -368,16 +480,33 @@ export default class extends React.PureComponent<Props, State> {
         });
     }
 
+    protected _onQuoteMsgDel() {
+        this.setState({
+            quoteMsg: undefined,
+        })
+    }
+
     protected _onSwitchSpeechKeyboard() {
         if (!this.state.showSpeech) {
             Keyboard.dismiss();
         }
         if (this.isIos) {
-            this.setState({
-                showSpeech: !this.state.showSpeech,
-                showEmojiView: false,
-                showMoreBoard: false,
-            });
+            check(PERMISSIONS.IOS.MICROPHONE)
+                .then(result => result === RESULTS.GRANTED ? RESULTS.GRANTED :
+                    request(PERMISSIONS.IOS.MICROPHONE))
+                .then(result => {
+                    if (result === RESULTS.GRANTED) {
+                        this.setState({
+                            showSpeech: !this.state.showSpeech,
+                            showEmojiView: false,
+                            showMoreBoard: false,
+                        });
+                    } else if (result === RESULTS.DENIED) {
+                        // do nothing
+                    } else {
+                        Toast.show(i18n.t('IMCommonNoRecordAuthority'));
+                    }
+                });
         } else {
             PermissionsAndroid.check(PermissionsAndroid.PERMISSIONS.RECORD_AUDIO)
                 .then(granted => granted ? PermissionsAndroid.RESULTS.GRANTED :
@@ -422,27 +551,7 @@ const styles = StyleSheet.create({
     container: {
         flexDirection: 'row',
         alignItems: 'flex-end',
-        maxHeight: 150, // TODO
-    },
-    inputBorder: {
-        flex: 1,
-        marginTop: 9,
-        marginBottom: 7,
-        backgroundColor: '#fcfcfc',
-        overflow: 'hidden',
-        alignSelf: 'center',
-        borderRadius: 4,
     },
-    input: {
-        fontSize: 16,
-        ...Platform.select({
-            ios: {lineHeight: 20},
-            android: {textAlignVertical: 'center'}
-        }),
-        minHeight: 40,
-        maxHeight: 120,
-        marginHorizontal: 5,
-    } as TextStyle,
     leftIconTouch: {
         width: 40,
         height: 40,
@@ -493,4 +602,75 @@ const styles = StyleSheet.create({
         fontWeight: 'bold',
         color: '#565656',
     },
+
+    msgContainer: {
+        flexDirection: 'column',
+        alignItems: 'stretch',
+        flex: 1,
+    },
+    inputBorder: {
+        marginTop: 9,
+        marginBottom: 13,
+        backgroundColor: '#fcfcfc',
+        overflow: 'hidden',
+        borderRadius: 4,
+    },
+    input: {
+        fontSize: 16,
+        ...Platform.select({
+            ios: { lineHeight: 20 },
+            android: { textAlignVertical: 'center' }
+        }),
+        minHeight: 30,
+        maxHeight: 120,
+        marginHorizontal: 5,
+    } as TextStyle,
+    quoteTextBorder: {
+        flexDirection: "row",
+        marginBottom: 13,
+        backgroundColor: '#cccccc',
+        overflow: 'hidden',
+        borderRadius: 4,
+        alignItems: "center",
+        justifyContent: "flex-end",
+        paddingEnd: 6,
+        height: 30,
+    },
+    quoteText: {
+        flex: 1,
+        fontSize: 13,
+        ...Platform.select({
+            ios: { lineHeight: 20 },
+            android: { textAlignVertical: 'center' }
+        }),
+        marginEnd: 10,
+        marginHorizontal: 5,
+    } as TextStyle,
+    delIconTouch: {
+        width: 25,
+        height: 25,
+        alignItems: 'center',
+        justifyContent: 'center',
+    },
+    delIcon: {
+        width: 16,
+        height: 16,
+    },
+    btnText: {
+        fontSize:17,
+        flex:1,
+        color:'black',
+        textAlign:'center',
+        alignItems:'center',
+        justifyContent:'center',
+        textAlignVertical:'center',
+        ...Platform.select({
+            ios:{
+                lineHeight:40,
+            },
+            android:{
+            }
+        }),
+        height: 40, // TODO
+    },
 });
\ No newline at end of file
diff --git a/standard/component/ConversationCell.tsx b/standard/component/ConversationCell.tsx
index 07d1ad4..833df76 100644
--- a/standard/component/ConversationCell.tsx
+++ b/standard/component/ConversationCell.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import {Dimensions, Image, SafeAreaView, StyleSheet, Text, View} from 'react-native';
-import Listener from 'react-native-general-listener';
-import {forceInset} from 'react-native-pure-navigation-bar';
+import Listener from '@hecom/listener';
+import {forceInset} from '@hecom/react-native-pure-navigation-bar';
 import * as PageKeys from '../pagekey';
 import * as Model from '../model';
 import {DateUtil} from '../util';
@@ -61,7 +61,7 @@ export default class extends React.PureComponent<Props> {
                     title={name}
                     subTitle={content}
                     right={this._renderRightColumn()}
-                    onClick={this._clickRow}
+                    onClick={this._clickRow.bind(this)}
                 />
                 {separatorLeft >= 0 && this._renderSeparatorLine()}
                 {!!this.state.unreadMessagesCount && this._renderBadge()}
@@ -141,13 +141,10 @@ export default class extends React.PureComponent<Props> {
     };
 
     _clickRow = () => {
-        this.props.navigation.navigate({
-            routeName: PageKeys.ChatDetail,
-            params: {
+        this.props.navigation.navigate( PageKeys.ChatDetail, {
                 imId: this.props.imId,
                 chatType: this.props.chatType,
-            },
-        });
+            });
     };
 
     _refresh = () => {
diff --git a/standard/component/DetailListView.tsx b/standard/component/DetailListView.tsx
index d28d3d5..b0fc989 100644
--- a/standard/component/DetailListView.tsx
+++ b/standard/component/DetailListView.tsx
@@ -1,61 +1,135 @@
 import React from 'react';
-import {FlatList, StyleSheet} from 'react-native';
+import {ImageBackground, ImageSourcePropType, FlatList, Image, StyleProp, StyleSheet, Text, TouchableHighlight, View, ViewStyle} from 'react-native';
 import PropTypes from 'prop-types';
+import {Delegate} from "react-native-im/standard/index";
 
 export default class extends React.PureComponent {
     static propTypes = {
         onLoadPage: PropTypes.func.isRequired,
         style: PropTypes.any,
+        newUnreadMessageCount: PropTypes.number,
+        oldUnreadMessageCount: PropTypes.number,
     };
 
     static defaultProps = {
         pageSize: 20,
+        oldUnreadMessageCount: 0,
+        newUnreadMessageCount: 0,
     };
 
     ids: Set<string>;
     innerIds: Set<string>;
+    listOffsetY = 0;
+    totalOldUnreadCount = 0;//记录当前未读的历史消息数量，当下拉获取全部未读消息后，此值减至0，右上角获取未读消息按钮隐藏。
+    firstLoadCount = 0;
+    reservedData = [];
 
     constructor(props) {
         super(props);
         this.ids = new Set();
         this.innerIds = new Set();
+        this.totalOldUnreadCount = props.oldUnreadMessageCount;
+        this.firstLoadCount = Math.max(this.props.oldUnreadMessageCount, this.props.pageSize);
         this.state = {
             data: [],
             isEnd: false,
             isLoading: false,
+            newUnreadMessageCount: props.newUnreadMessageCount,
+            oldUnreadMessageCount: props.oldUnreadMessageCount,
         };
+        this._scrollToShowNewUnreadMessage = this._scrollToShowNewUnreadMessage.bind(this);
+        this._scrollToShowOldUnreadMessage = this._scrollToShowOldUnreadMessage.bind(this);
+        this._loadPage = this._loadPage.bind(this);
+        this._loadCount = this._loadCount.bind(this);
+        this._renderMoreMessageElement = this._renderMoreMessageElement.bind(this);
+        this.scrollToTop = this.scrollToTop.bind(this);
+        this.scrollToBottom = this.scrollToBottom.bind(this);
     }
 
     componentDidMount() {
-        this._loadPage();
+        //点击查看历史未读消息，为了能快速scroll到相应位置，所以这里一次性拉取。
+        this._loadCount(this.firstLoadCount);
     }
 
     render() {
         return (
-            <FlatList
-                ref={ref => this.innerList = ref}
-                inverted={true}
-                bounces={false}
-                contentContainerStyle={styles.content}
-                showsVerticalScrollIndicator={false}
-                keyboardShouldPersistTaps={'handled'}
-                initialNumToRender={this.props.pageSize}
-                data={this.state.data}
-                onEndReachedThreshold={0.3}
-                onEndReached={this._loadPage}
-                keyExtractor={item => item.messageId || item.innerId}
-                {...this.props}
-                renderItem={(arg) => this.props.renderItem(arg, this.state.data)}
-            />
+            <View style={styles.content}>
+                <FlatList
+                    ref={ref => this.innerList = ref}
+                    inverted={true}
+                    bounces={false}
+                    contentContainerStyle={styles.content}
+                    showsVerticalScrollIndicator={false}
+                    keyboardShouldPersistTaps={'handled'}
+                    initialNumToRender={this.firstLoadCount}
+                    data={this.state.data}
+                    onEndReachedThreshold={0.3}
+                    onEndReached={this._loadPage}
+                    onScroll={(event) => {
+                        this.listOffsetY = event.nativeEvent.contentOffset.y
+
+                        if (this.listOffsetY <= 30) {
+                            if (this.reservedData.length > 0) {
+                                const result = [...this.reservedData, ...this.state.data];
+                                this.reservedData = [];
+                                this.setState({data: result, newUnreadMessageCount: 0});
+                            } else if (this.state.newUnreadMessageCount > 0) {
+                                this.setState({newUnreadMessageCount: 0});
+                            }
+                        }
+                    }}
+                    keyExtractor={item => item.messageId || item.innerId}
+                    {...this.props}
+                    renderItem={(arg) => this.props.renderItem(arg, this.state.data)}
+                />
+                {this.state.oldUnreadMessageCount > 12 && this._renderMoreMessageElement({top: 15}, this.state.oldUnreadMessageCount, require('./image/oldUnreadMessage.png'), this._scrollToShowOldUnreadMessage.bind(this))}
+                {this.state.newUnreadMessageCount > 0 && this._renderMoreMessageElement({bottom: 15}, this.state.newUnreadMessageCount, require('./image/newUnreadMessage.png'), this._scrollToShowNewUnreadMessage.bind(this))}
+            </View>
         );
     }
 
+    _renderMoreMessageElement(style: StyleProp<ViewStyle>, count: number, imageSource: ImageSourcePropType, callback: () => void) {
+        let desc = count > 99 ? '99+' : count.toString()
+        return (
+            <ImageBackground style={[styles.moreMessageContainer, style]}
+                             source={require('./image/unreadMessageContainer.png')}>
+                <TouchableHighlight
+                    style={styles.moreMessage}
+                    underlayColor={'#d7d8d8'}
+                    onPress={callback}
+                >
+                    <View style={styles.moreMessageBorder}>
+                        <Image style={styles.moreMessageDirection}
+                               source={imageSource}
+                        />
+                        <Text style={styles.moreMessageText}>
+                            {desc}条新消息
+                        </Text>
+                    </View>
+                </TouchableHighlight>
+            </ImageBackground>
+        )
+    }
+
+    _scrollToShowNewUnreadMessage() {
+        this.setState({newUnreadMessageCount: 0}, this.scrollToTop);
+    }
+
+    _scrollToShowOldUnreadMessage() {
+        this.setState({oldUnreadMessageCount: 0});
+        this.scrollToBottom()
+    }
+
     _loadPage = () => {
+        return this._loadCount(this.props.pageSize)
+    }
+
+    _loadCount = (onePageSize: number = this.props.pageSize) => {
         if (this.state.isEnd || this.state.isLoading) {
             return;
         }
         this.setState({isLoading: true});
-        return this.props.onLoadPage(this.state.data, this.props.pageSize)
+        return this.props.onLoadPage(this.state.data, onePageSize)
             .then(({data, isEnd, isAllData}) => {
                 data = data.reduce((prv, cur) => {
                     const {messageId, innerId} = cur;
@@ -74,17 +148,20 @@ export default class extends React.PureComponent {
                 } else {
                     data = [...this.state.data, ...data];
                 }
-                return {
-                    data: data,
-                    isEnd: isEnd,
-                };
-            })
-            .finally((state = {}) => {
+
+                if (this.totalOldUnreadCount <= 0 && this.state.oldUnreadMessageCount > 0) {
+                    this.setState({data: data, isEnd: isEnd, isLoading: false, oldUnreadMessageCount: 0});
+                } else {
+                    this.setState({data: data, isEnd: isEnd, isLoading: false});
+                }
+                this.totalOldUnreadCount = 0;
+            }).catch(() => {
                 this.setState({
-                    ...state,
+                    data: [],
+                    isEnd: false,
                     isLoading: false,
                 });
-            });
+            })
     };
 
     scrollToTop = (animated = false) => {
@@ -93,9 +170,31 @@ export default class extends React.PureComponent {
         }, 200);
     };
 
+    scrollToBottom = (animated = false) => {
+        setTimeout(() => {
+            this.innerList && this.innerList.scrollToEnd({animated: animated});
+        }, 200);
+    };
+
     insert = (newMessages) => {
         const data = [...this.state.data];
+        //是否有我自己发送的，如果有，直接自动scroll到底
+        let hasFromMe = false;
+        //记录系统消息的条数，不应该计算进入未读消息。
+        let systemMessageCount = 0;
+        const me = Delegate.user.getMine().userId;
         const toInsert = newMessages.reduce((prv, cur) => {
+            if (!hasFromMe
+                && me
+                && cur.from
+                && me == cur.from
+                && cur.data
+                && (!(cur.data.isSystem && cur.data.isSystem == true))) {
+                hasFromMe = true;
+            }
+            if (cur.data.isSystem && cur.data.isSystem == true) {
+                systemMessageCount += 1;
+            }
             const {messageId, innerId} = cur;
             if (messageId && this.ids.has(messageId) ||
                 innerId && this.innerIds.has(innerId)) {
@@ -112,14 +211,44 @@ export default class extends React.PureComponent {
                 return prv;
             }
         }, []);
-        const result = [...toInsert.reverse(), ...data];
-        this.setState({data: result}, this.scrollToTop);
+        if (!hasFromMe && this.listOffsetY > 30 && newMessages && newMessages.length > 0) {
+            this.reservedData = [...toInsert.reverse(), ...this.reservedData];
+            this.setState({newUnreadMessageCount: newMessages.length + this.state.newUnreadMessageCount - systemMessageCount});
+        } else {
+            const result = [...toInsert.reverse(), ...this.reservedData, ...data];
+            this.reservedData = [];
+            this.setState({data: result, newUnreadMessageCount: 0}, this.scrollToTop);
+        }
     };
 }
 
 const styles = StyleSheet.create({
     content: {
-        paddingTop: 10,
-        paddingBottom: 10,
     },
-});
\ No newline at end of file
+    moreMessageContainer: {
+        position: 'absolute',
+        right: 0,
+        width: 120,
+        height: 46,
+    },
+    moreMessage: {
+        flex: 1,
+        borderTopLeftRadius: 23,
+        borderBottomLeftRadius:23,
+        left: 5,
+    },
+    moreMessageBorder: {
+        flex: 1,
+        flexDirection: 'row',
+        alignItems: 'center',
+        justifyContent: 'space-around',
+    },
+    moreMessageDirection: {
+        marginLeft: 8,
+    },
+    moreMessageText: {
+        fontSize: 12,
+        color: '#FC6364',
+        marginRight: 8,
+    },
+});
diff --git a/standard/component/EmojiPickView.tsx b/standard/component/EmojiPickView.tsx
index 049ad82..9e98937 100644
--- a/standard/component/EmojiPickView.tsx
+++ b/standard/component/EmojiPickView.tsx
@@ -1,18 +1,22 @@
 import React from 'react';
-import { FlatList, Image, ScrollView, StyleSheet, TouchableOpacity, View } from 'react-native';
-import PropTypes from 'prop-types';
+import {Dimensions, FlatList, Image, ScrollView, StyleSheet, TouchableOpacity, View} from 'react-native';
 import delegate from '../delegate';
 
-export default class extends React.PureComponent {
-    static propTypes = {
-        key: PropTypes.string.isRequired,
-        height: PropTypes.number.isRequired,
-        onPickEmoji: PropTypes.func,
-        style: PropTypes.any,
-        itemSize: PropTypes.number,
-        tabViewHeight: PropTypes.number,
-    };
+interface Props {
+    key: string;
+    height: number;
+    onPickEmoji: () => void;
+    style: any;
+    itemSize: number;
+    tabViewHeight: number;
+}
+
+interface State {
+    width: number;
+    curIndex: number;
+}
 
+export default class extends React.PureComponent<Props, State> {
     static defaultProps = {
         itemSize: 42,
         tabViewHeight: 30,
@@ -21,6 +25,8 @@ export default class extends React.PureComponent {
     DeleteItem = '__emoji_pick_delete__';
     PlaceholderItem = '__emoji_pick_placeholder__';
 
+    scrollView: ScrollView;
+
     constructor(props) {
         super(props);
         this.state = {
@@ -74,9 +80,10 @@ export default class extends React.PureComponent {
 
     _renderPage = (collection, obj, index) => {
         const {marginH, marginV, numColumns} = collection;
+        const {width, height} = Dimensions.get('window')
         return (
             <FlatList
-                key={index}
+                key={index + (width > height ? 'h' : 'v')}
                 style={{marginHorizontal: marginH, marginVertical: marginV}}
                 data={obj}
                 renderItem={this._renderItem}
@@ -94,17 +101,17 @@ export default class extends React.PureComponent {
             height: this.props.itemSize,
         };
         if (text === this.PlaceholderItem) {
-            return <View style={style} />;
+            return <View style={style}/>;
         }
         return (
             <TouchableOpacity onPress={this._clickEmoji.bind(this, text)}>
                 <View style={[styles.itemview, style]}>
-                    <Image style={styles.icon} source={image} />
+                    <Image style={styles.icon} source={image}/>
                 </View>
             </TouchableOpacity>
         );
     };
-    
+
     _onContentHorizontalScrollEnd = (event) => {
         const offsetX = event.nativeEvent.contentOffset.x;
         const newIndex = Math.floor(offsetX / this.state.width);
@@ -168,8 +175,7 @@ export default class extends React.PureComponent {
 }
 
 const styles = StyleSheet.create({
-    view: {
-    },
+    view: {},
     scrollview: {
         flexDirection: 'row',
     },
@@ -185,4 +191,4 @@ const styles = StyleSheet.create({
         width: 28,
         height: 28,
     },
-});
\ No newline at end of file
+});
diff --git a/standard/component/FakeSearchBar.tsx b/standard/component/FakeSearchBar.tsx
index 405bb07..e38a9b1 100644
--- a/standard/component/FakeSearchBar.tsx
+++ b/standard/component/FakeSearchBar.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { SafeAreaView } from 'react-native';
-import { forceInset } from 'react-native-pure-navigation-bar';
+import { forceInset } from '@hecom/react-native-pure-navigation-bar';
 import { FakeSearchBar } from 'react-native-general-searchbar';
 
 export default class extends React.PureComponent {
diff --git a/standard/component/FixedSectionList.tsx b/standard/component/FixedSectionList.tsx
new file mode 100644
index 0000000..0f0a0bd
--- /dev/null
+++ b/standard/component/FixedSectionList.tsx
@@ -0,0 +1,219 @@
+import React from 'react';
+import { Platform, LayoutAnimation, StyleSheet, Text, TouchableHighlight, View} from 'react-native';
+import delegate from '../delegate';
+import { RecyclerListView, DataProvider, LayoutProvider } from "recyclerlistview";
+import StickyContainer from 'recyclerlistview/sticky';
+
+const ViewTypes = {
+    CELL: 0,
+    SECTION: 1,
+    HEADER: 2,
+    NULL: 3
+};
+
+export interface FixedSectionListProps {
+    renderItem: (data: any) => JSX.Element | JSX.Element[] | null;
+    renderSectionHeader: (title: String) => JSX.Element | JSX.Element[] | null;
+    renderHeaderComponent: () => JSX.Element | JSX.Element[] | null;
+    sections: Array<any>;
+    itemHeight: number,
+    sectionHeight: number,
+    headerHeight: number,
+    itemWidth: number,
+    hasHeader: number,
+    renderAheadOffset?: number;
+}
+
+export default class extends React.PureComponent<FixedSectionListProps> {
+
+    static defaultProps = {
+        headerHeight: 0,
+        itemHeight: 0,
+        sectionHeight: 0,
+        itemWidth: 0,
+    };
+    _layoutProvider: LayoutProvider;
+    headerIndexs: Array<number> = [];
+    dataLength = 0;
+    _dataProvider: DataProvider;
+
+    constructor(props: FixedSectionListProps) {
+        super(props);
+
+        this._dataProvider = new DataProvider((r1, r2) => {
+            return r1 !== r2;
+        });
+
+        this._layoutProvider = new LayoutProvider(
+            (index) => {
+                if (props.hasHeader && index == 0) {
+                    return ViewTypes.HEADER;
+                }else if (this.headerIndexs.includes(index)) {
+                    return ViewTypes.SECTION;
+                } else if (index < this.dataLength) {
+                    return ViewTypes.CELL;
+                } else {
+                    return ViewTypes.NULL;
+                }
+            },
+            (type, dim) => {
+                switch (type) {
+                    case ViewTypes.SECTION:
+                        dim.width = this.props.itemWidth;
+                        dim.height = this.props.sectionHeight;
+                        break;
+                    case ViewTypes.CELL:
+                        dim.width = this.props.itemWidth;
+                        dim.height = this.props.itemHeight;
+                        break;
+                    case ViewTypes.HEADER:
+                        dim.width = this.props.itemWidth;
+                        dim.height = this.props.headerHeight;
+                        break;
+                    default:
+                        dim.width = 0;
+                        dim.height = 0;
+                }
+            }
+        );
+        const dataList = this._setDataList(this.props.sections);
+        this.state = {
+            dataList: dataList,
+            isShowBackTop: false
+        }
+    }
+
+    _setDataList = (data: Array<any>)=>{
+        let arr: Array<any> = [];
+        let i = 0
+        if (this.props.hasHeader) {
+            arr[i] = i;
+            i++;
+        }
+
+        this.headerIndexs = [];
+        data.forEach(element => {
+            const header = {key: element.key, title: element.title}
+            arr[i] = header;
+            this.headerIndexs.push(i);
+            i++;
+            element.data.forEach((ele: any) => {
+                arr[i] = ele;
+                i++;
+            });
+        });
+        this.dataLength = arr.length;
+        const dataList = this._dataProvider.cloneWithRows(arr);
+        return dataList;
+    }
+
+    render() {
+        const {sections = []} = this.props;
+        return (
+            <View style={styles.container}>
+                <StickyContainer
+                    stickyHeaderIndices={this.headerIndexs}
+                    overrideRowRenderer={this._rowRenderer.bind(this)}>  
+                    <RecyclerListView
+                        ref={v => this.list = v}
+                        layoutProvider={this._layoutProvider}
+                        dataProvider={this.state.dataList}
+                        rowRenderer={this._rowRenderer.bind(this)}
+                        onScroll={this._onScroll.bind(this)}
+                        renderAheadOffset = {this.props.renderAheadOffset}
+                        canChangeSize = {true}
+                    />
+                </StickyContainer>
+                {sections && sections.length > 0 && <delegate.component.SelectList
+                    sections={['↑'].concat(sections.map(i => i.key))}
+                    onItemChange={this._scrollToLocation}
+                />}
+                {this.state.isShowBackTop && this._renderBackTop()}
+            </View>
+        );
+    }
+
+    _rowRenderer = (type, data)=> {
+        switch (type) {
+            case ViewTypes.SECTION: {
+                return this.props.renderSectionHeader(data.title);
+            };
+            case ViewTypes.CELL: {
+                return this.props.renderItem(data);
+            };
+            case ViewTypes.HEADER: {
+                return this.props.renderHeaderComponent();
+            };
+            default:
+                return null;
+        }
+    }
+
+    _renderBackTop = () => {
+        return (
+            <TouchableHighlight
+                style={styles.backTop}
+                onPress={() => this.list.scrollToTop(false)}
+            >
+                <View>
+                    <Text style={styles.backTopText}>
+                        {'返回顶部'}
+                    </Text>
+                </View>
+            </TouchableHighlight>
+        );
+    };
+
+    _scrollToLocation = (index) => {
+        if (index == 0) {
+            this.list.scrollToTop(false)
+        } else {
+            if (index - 1 < this.headerIndexs.length) {
+                this.list.scrollToIndex(this.headerIndexs[index - 1], false) 
+            }
+        }
+    };
+
+    _onScroll = (event) => {
+        const {contentOffset: {y}, layoutMeasurement: {height}} = event.nativeEvent;
+        const needShowBtn = y > height;
+        if (needShowBtn && !this.state.isShowBackTop) {
+            this._showBackTopBtn(true);
+        } else if (!needShowBtn && this.state.isShowBackTop) {
+            this._showBackTopBtn(false);
+        }
+    };
+
+    _showBackTopBtn = (isShow) => {
+        Platform.OS === 'ios' && LayoutAnimation.easeInEaseOut();
+        this.setState({
+            isShowBackTop: isShow,
+        });
+    };
+}
+
+const styles = StyleSheet.create({
+    container: {
+        justifyContent: 'center',
+        flex: 1,
+    },
+    backTop: {
+        borderTopLeftRadius: 13,
+        height: 26,
+        borderBottomLeftRadius: 13,
+        borderWidth: 2,
+        borderRightWidth: 0,
+        borderColor: '#e15151',
+        justifyContent: 'center',
+        alignItems: 'center',
+        paddingHorizontal: 16,
+        backgroundColor: 'white',
+        position: 'absolute',
+        right: 0,
+        bottom: 48,
+    },
+    backTopText: {
+        color: '#e15151',
+        fontSize: 11,
+    },
+});
\ No newline at end of file
diff --git a/standard/component/HeaderCell.tsx b/standard/component/HeaderCell.tsx
new file mode 100644
index 0000000..9b0f770
--- /dev/null
+++ b/standard/component/HeaderCell.tsx
@@ -0,0 +1,186 @@
+import React from 'react';
+import { Image, StyleSheet, Text, TouchableHighlight, View } from 'react-native';
+import delegate from '../delegate';
+
+export default class extends React.PureComponent {
+    static defaultProps = {
+        labels: [],
+    };
+
+    render() {
+        const {onClick, onLongPress} = this.props;
+        const content = this._renderContent();
+        const separatorLine = this._renderSeparatorLine();
+        return onClick || onLongPress ? (
+            <TouchableHighlight onPress={onClick} onLongPress={onLongPress}>
+                <>
+                    {content}
+                    {separatorLine}
+                </>
+            </TouchableHighlight>
+        ) : content;
+    }
+
+    _renderContent = () => {
+        const {style, subTitle, right} = this.props;
+        return (
+            <View style={[styles.container, style]}>
+                {this._renderIcon()}
+                <View style={styles.layout}>
+                    {this._renderTitleLine()}
+                    {!!subTitle && (
+                        <Text style={styles.subTitle} numberOfLines={1}>
+                            {subTitle}
+                        </Text>
+                    )}
+                </View>
+                {typeof right === 'function' ? right() : right}
+            </View>
+        );
+    };
+
+    _renderSeparatorLine = () => {
+        const {showBranchBottom} = this.props;
+        const style = {
+            backgroundColor: delegate.style.separatorLineColor,
+            marginLeft: showBranchBottom ? 74 : 14,
+            height: StyleSheet.hairlineWidth,
+        };
+        return <View style={style} />;
+    };
+
+    _renderTitleLine = () => {
+        const {title, labels} = this.props;
+        return (
+            <View style={styles.titleline}>
+                <Text style={styles.title} numberOfLines={1}>
+                    {title}
+                </Text>
+                {labels.map(this._renderLabel)}
+            </View>
+        );
+    };
+    
+    _renderIcon = () => {
+        const {avatar, showBranchTop, showBranchBottom} = this.props;
+        const isAvatar = Object.prototype.isPrototypeOf(avatar) && avatar.imId;
+
+        let centerView;
+        let topStyle = {};
+        if (showBranchTop) {
+            topStyle = {
+                borderLeftColor: delegate.style.separatorLineColor,
+                borderLeftWidth: 1,
+                borderBottomColor: delegate.style.separatorLineColor,
+                borderBottomWidth: 1,
+            }
+        } else {
+            if (isAvatar) {
+                centerView = (
+                    <delegate.component.AvatarImage
+                        {...avatar}
+                        style={styles.avatar}
+                    />
+                );
+            } else {
+                const src = typeof avatar === 'string' ?
+                    { uri: delegate.func.fitUrlForAvatarSize(avatar, 48) } :
+                    avatar;
+                centerView = <Image style={styles.icon} resizeMode={'contain'} source={src} />;
+            }
+        }
+
+        let bottomStyle = {};
+        if (showBranchBottom) {
+            bottomStyle = {
+                borderLeftColor: delegate.style.separatorLineColor,
+                borderLeftWidth: 1,
+            }
+        }
+
+        return (
+            <View style={{alignItems: 'center'}}>
+                <View style={styles.branchContent}>
+                    <View style={styles.branch} />
+                    <View style={[styles.branch, topStyle]} />
+                </View>
+                {centerView}
+                <View style={[styles.branchContent, {marginTop: showBranchTop ? 0 : 5}]}>
+                    <View style={styles.branch} />
+                    <View style={[styles.branch, bottomStyle]} />
+                </View>
+            </View>
+        )
+    };
+
+    _renderLabel = ({name, color}, index) => {
+        return (
+            <View key={index} style={[styles.label, {borderColor: color}]}>
+                <Text style={[styles.labelText, {color}]}>
+                    {name}
+                </Text>
+            </View>
+        );
+    };
+}
+
+const styles = StyleSheet.create({
+    container: {
+        flexDirection: 'row',
+        alignItems: 'center',
+        paddingHorizontal: 14,
+        backgroundColor: 'white',
+    },
+    icon: {
+        height: 48,
+        width: 48,
+    },
+    avatar: {
+    },
+    layout: {
+        flex: 1,
+        marginLeft: 12,
+        height: 70,
+        flexDirection: 'column',
+        justifyContent: 'center',
+    },
+    titleline: {
+        flexDirection: 'row',
+        alignItems: 'center',
+    },
+    title: {
+        fontSize: 16,
+        color: '#222',
+    },
+    label: {
+        borderWidth: 1,
+        borderRadius: 4,
+        justifyContent: 'center',
+        alignItems: 'center',
+        marginLeft: 5,
+    },
+    labelText: {
+        paddingHorizontal: 2,
+        fontSize: 13,
+    },
+    subTitle: {
+        fontSize: 14,
+        color: '#999999',
+        marginTop: 4,
+    },
+    branchContent: {
+        backgroundColor: 'transparent',
+        flex: 1,
+        flexDirection: 'row',
+        width: 48,
+    },
+    branch: {
+        backgroundColor: 'transparent',
+        flex: 1
+    },
+    branchRow: {
+        backgroundColor: delegate.style.separatorLineColor,
+        height: 0.5,
+        flex: 1
+    },
+});
\ No newline at end of file
diff --git a/standard/component/ListCell.tsx b/standard/component/ListCell.tsx
index b87a68e..e29ee46 100644
--- a/standard/component/ListCell.tsx
+++ b/standard/component/ListCell.tsx
@@ -3,38 +3,6 @@ import { Image, StyleSheet, Text, TouchableHighlight, View } from 'react-native'
 import delegate from '../delegate';
 
 export default class extends React.PureComponent {
-    // static propTypes = {
-    //     avatar: PropTypes.oneOfType([
-    //         PropTypes.string,
-    //         PropTypes.number,
-    //         PropTypes.shape(Types.BasicConversation),
-    //         PropTypes.shape({
-    //             uri: PropTypes.string,
-    //         })
-    //     ]),
-    //     title: PropTypes.oneOfType([
-    //         PropTypes.string,
-    //         PropTypes.element,
-    //         PropTypes.arrayOf(PropTypes.element),
-    //     ]),
-    //     labels: PropTypes.arrayOf(PropTypes.shape({
-    //         name: PropTypes.string,
-    //         color: PropTypes.string,
-    //     })),
-    //     subTitle: PropTypes.oneOfType([
-    //         PropTypes.string,
-    //         PropTypes.element,
-    //         PropTypes.array
-    //     ]),
-    //     onClick: PropTypes.func,
-    //     onLongPress: PropTypes.func,
-    //     right: PropTypes.oneOfType([
-    //         PropTypes.element,
-    //         PropTypes.arrayOf(PropTypes.element),
-    //         PropTypes.func,
-    //     ]),
-    //     style: PropTypes.any,
-    // };
 
     static defaultProps = {
         labels: [],
@@ -69,7 +37,7 @@ export default class extends React.PureComponent {
     };
 
     _renderTitleLine = () => {
-        const {title, labels} = this.props;
+        const {title, labels, isWeakNode} = this.props;
         return (
             <View style={styles.titleline}>
                 <Text style={styles.title} numberOfLines={1}>
diff --git a/standard/component/MessageBubble.tsx b/standard/component/MessageBubble.tsx
index df1faa5..721d602 100644
--- a/standard/component/MessageBubble.tsx
+++ b/standard/component/MessageBubble.tsx
@@ -1,8 +1,10 @@
-import React from 'react';
-import {Dimensions, ImageSourcePropType, TouchableWithoutFeedback, View} from 'react-native';
+import React, { RefObject } from 'react';
+import {Dimensions, ImageSourcePropType, PixelRatio, TouchableWithoutFeedback, View} from 'react-native';
 import ImageCapInset from '@hecom/react-native-image-capinsets';
 import * as Model from '../model';
 import {Action, Component} from '../typings';
+import delegate from '../delegate';
+import { QuoteMsgBubble } from '../../plugin/message/display';
 
 export interface Props extends Component.MessageBubbleProps {
     leftBubble: ImageSourcePropType;
@@ -20,7 +22,7 @@ export default class extends React.PureComponent<Props, State> {
     };
 
     protected readonly paddingHorizontal = 5;
-    protected bubble: View | null = null;
+    protected bubble: RefObject<View> = React.createRef();
     protected innerView: Action.Display.Result | null = null;
 
     state: State = {
@@ -28,37 +30,70 @@ export default class extends React.PureComponent<Props, State> {
     };
 
     render() {
-        const {isSender, leftBubble, rightBubble} = this.props;
+        const {isSender, touchable, leftBubble, rightBubble, message} = this.props;
         const bubbleImage = isSender ? rightBubble : leftBubble;
         const maxWidth = Dimensions.get('window').width / 3 * 2;
         const paddingLeft = isSender ? 0 : this.paddingHorizontal;
         const paddingRight = isSender ? this.paddingHorizontal : 0;
         const innerMaxWidth = maxWidth - paddingLeft - paddingRight;
+        const ratio = PixelRatio.get();
+        const rootAlignItems = isSender?'flex-end':'flex-start';
         return (
-            <TouchableWithoutFeedback
-                onPress={this._onPress.bind(this)}
-                onLongPress={this._onLongPress.bind(this)}
-            >
-                <View ref={ref => this.bubble = ref}>
-                    {this.state.enableBubble ? (
-                        <ImageCapInset
-                            capInsets={{top: 28, left: 13, bottom: 10, right: 13}}
-                            resizeMode='stretch'
-                            source={bubbleImage}
-                            style={{maxWidth, paddingLeft, paddingRight}}
-                        >
-                            {this._renderMessage(innerMaxWidth)}
-                        </ImageCapInset>
-                    ) : (
-                        <View style={{maxWidth, paddingLeft, paddingRight}}>
-                            {this._renderMessage(innerMaxWidth)}
-                        </View>
-                    )}
-                </View>
-            </TouchableWithoutFeedback>
+            <View style={{ flexDirection: 'column',alignItems: rootAlignItems}}>
+                <TouchableWithoutFeedback
+                    disabled={touchable}
+                    onPress={this._onPress.bind(this)}
+                    onLongPress={this._onLongPress.bind(this)}
+                >
+                    <View ref={this.bubble} style={{ flexDirection: 'row' }}>
+                        {this.state.enableBubble ? (
+                            <View>
+                                <ImageCapInset
+                                    capInsets={{ top: 84 / ratio, left: 39 / ratio, bottom: 30 / ratio, right: 39 / ratio }}
+                                    resizeMode='stretch'
+                                    source={bubbleImage}
+                                    style={{ maxWidth, paddingLeft, paddingRight }}
+                                >
+                                    {this._renderMessage(innerMaxWidth)}
+                                </ImageCapInset>
+                            </View>
+
+                        ) : (
+                                <View style={{ maxWidth, paddingLeft, paddingRight }}>
+                                    {this._renderMessage(innerMaxWidth)}
+                                </View>
+                            )}
+                        {!isSender && this._renderRedFlag()}
+                    </View>
+                </TouchableWithoutFeedback>
+                <QuoteMsgBubble
+                    message={message}
+                    maxWidth={maxWidth}
+                    paddingLeft={paddingLeft}
+                    paddingRight={paddingRight}
+                    innerMaxWidth={innerMaxWidth}
+                />
+            </View>
         );
     }
 
+    protected _renderRedFlag() {
+        if (this.props.message.data.shouldRead) {
+            return (
+                <View style={{
+                    backgroundColor: 'red',
+                    width: 5,
+                    height: 5,
+                    borderRadius: 10,
+                    marginLeft: 5,
+                    alignSelf: 'center',
+                }}/>
+            )
+        } else {
+            return null;
+        }
+    }
+
     protected _renderMessage(maxWidth: number) {
         const {message, isSender, messages} = this.props;
         const state = {
@@ -87,6 +122,14 @@ export default class extends React.PureComponent<Props, State> {
     }
 
     protected _onPress() {
+        const {message, message: {messageId, type}} = this.props;
+        //语音消息删除未读标志
+        if (type == 5 && messageId) {
+            let ext = {shouldRead: false};
+            delegate.im.conversation.updateMessageExt(messageId, ext);
+        }
+        message.data.shouldRead = false;
+        this.forceUpdate();
         if (this.innerView && this.innerView.onPress) {
             this.innerView.onPress();
         }
@@ -94,13 +137,13 @@ export default class extends React.PureComponent<Props, State> {
 
     protected _onLongPress() {
         const {message, isSender, onShowMenu} = this.props;
-        this.bubble && this.bubble.measure((width: number, height: number, px: number, py: number) => {
+        if (!!this.bubble.current) {
             const param = {
                 ref: this.bubble,
                 isSender: isSender,
                 message: message,
             };
             onShowMenu(param);
-        });
+        }
     }
 }
diff --git a/standard/component/MessageMenu.tsx b/standard/component/MessageMenu.tsx
index fadbb7f..0d209c3 100644
--- a/standard/component/MessageMenu.tsx
+++ b/standard/component/MessageMenu.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
-import { Text, View, TouchableWithoutFeedback, StyleSheet, Dimensions, Platform } from 'react-native';
+import { Text, View, TouchableWithoutFeedback, StyleSheet } from 'react-native';
 import { Component } from '../typings';
-import { getSafeAreaInset, DEFAULT_NAVBAR_HEIGHT } from 'react-native-pure-navigation-bar';
-import Popover from 'react-native-popover-view';
+import Popover, { PopoverMode } from 'react-native-popover-view';
 
 export type Props = Component.MessageMenuProps;
 
@@ -10,18 +9,18 @@ export default class extends React.PureComponent<Props> {
     static defaultProps = {};
 
     render() {
-        const verticalOffset = this._getOffset();
+        // const verticalOffset = this._getOffset();
         const {menuShow, menuRef, onClose} = this.props;
         return (
             <Popover
                 isVisible={menuShow}
-                fromView={menuRef}
-                onClose={onClose}
-                placement={'auto'}
-                showInModal={false}
-                showBackground={false}
-                verticalOffset={-verticalOffset}
+                from={menuRef}
+                onRequestClose={onClose}
+                mode={PopoverMode.RN_MODAL}
+                // verticalOffset={-verticalOffset}
                 popoverStyle={styles.popover}
+                backgroundStyle = {{backgroundColor: 'transparent'}}
+                animationConfig = {{duration: 150}}
             >
                 {this._renderContent()}
             </Popover>
@@ -56,13 +55,13 @@ export default class extends React.PureComponent<Props> {
         );
     }
 
-    protected _getOffset() {
-        const offset = getSafeAreaInset(undefined, true).top;
-        const {width, height} = Dimensions.get('window');
-        const isLandscape = width > height;
-        const isIos = Platform.OS === 'ios';
-        return isLandscape && isIos ? 30 : offset + DEFAULT_NAVBAR_HEIGHT;
-    }
+    // protected _getOffset() {
+    //     const offset = getSafeAreaInset(undefined, true).top;
+    //     const {width, height} = Dimensions.get('window');
+    //     const isLandscape = width > height;
+    //     const isIos = Platform.OS === 'ios';
+    //     return isLandscape && isIos ? 30 : offset + DEFAULT_NAVBAR_HEIGHT;
+    // }
 
     protected _onPress(action: () => void) {
         this.props.onClose();
diff --git a/standard/component/MoreBoard.tsx b/standard/component/MoreBoard.tsx
index 3410415..d31cfc0 100644
--- a/standard/component/MoreBoard.tsx
+++ b/standard/component/MoreBoard.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import {Dimensions, Image, StyleSheet, Text, TouchableOpacity, View} from 'react-native';
-import {getSafeAreaInset} from 'react-native-pure-navigation-bar';
+import {getSafeAreaInset} from '@hecom/react-native-pure-navigation-bar';
 import * as Model from '../model';
 import BottomBar from './BottomBar';
 
diff --git a/standard/component/SearchList.tsx b/standard/component/SearchList.tsx
index 7cd84cc..7c25c0f 100644
--- a/standard/component/SearchList.tsx
+++ b/standard/component/SearchList.tsx
@@ -1,20 +1,21 @@
 import React from 'react';
-import { Image, Keyboard, StyleSheet, Text, TouchableHighlight, TouchableOpacity, View, } from 'react-native';
+import { Image, Keyboard, StyleSheet, Text, TouchableHighlight, TouchableOpacity, View, SafeAreaView} from 'react-native';
 import PropTypes from 'prop-types';
-import NaviBar from 'react-native-pure-navigation-bar';
+import NaviBar from '@hecom/react-native-pure-navigation-bar';
 import SearchBar from 'react-native-general-searchbar';
-import AsyncStorage from 'react-native-general-storage';
+import AsyncStorage from '@hecom/storage';
 import { KeyboardAwareFlatList, KeyboardAwareSectionList } from 'react-native-keyboard-aware-scroll-view';
 import { Storage } from '../typings';
 import delegate from '../delegate';
 
-export default class extends React.PureComponent {
+export default class extends React.Component {
     static propTypes = {
         searchText: PropTypes.string,
         searchHint: PropTypes.string,
         showHistory: PropTypes.bool,
         historyKey: PropTypes.string,
         doSearch: PropTypes.func.isRequired,
+        doCustomSearch: PropTypes.func,
         onItemClick: PropTypes.func,
         itemKey: PropTypes.string,
         maxHistoryLength: PropTypes.number,
@@ -62,16 +63,19 @@ export default class extends React.PureComponent {
                     title={this._renderSearchBar()}
                 />
                 {showHistory && !result ? this._renderHistory() : (
-                    <List
-                        {...this.props}
-                        data={result || []}
-                        sections={result || []}
-                        ListEmptyComponent={this._renderEmpty('没有结果')}
-                        renderSectionFooter={this._renderSectionFooter}
-                        renderItem={this._renderResultItem()}
-                        ItemSeparatorComponent={ItemSeparatorComponent}
-                        SectionSeparatorComponent={SectionSeparatorComponent}
-                    />
+                    <>
+                        <List
+                            {...this.props}
+                            data={result || []}
+                            sections={result || []}
+                            ListEmptyComponent={this._renderEmpty('没有结果')}
+                            renderSectionFooter={this._renderSectionFooter}
+                            renderItem={this._renderResultItem()}
+                            ItemSeparatorComponent={ItemSeparatorComponent}
+                            SectionSeparatorComponent={SectionSeparatorComponent}
+                        />
+                        <SafeAreaView />
+                    </>
                 )}
             </View>
         );
@@ -199,6 +203,9 @@ export default class extends React.PureComponent {
     };
 
     _onChangeSearchText = (searchText) => {
+        if (searchText === this.state.searchText) {
+            return;
+        }
         const state = {searchText};
         if (!searchText) {
             state.result = null;
@@ -260,6 +267,19 @@ export default class extends React.PureComponent {
         if (text === undefined || text.length === 0) {
             return;
         }
+        this.props.doCustomSearch && this.props.doCustomSearch(text).then((result) => {
+            if (result && result.length > 0) {
+                let stateResult = this.state.result || [];
+                //去重
+                stateResult = stateResult.filter((itemO) => {
+                    return result.filter((itemT) => {
+                        return itemO.title === itemT.title;
+                    }).length == 0
+                });
+                stateResult.unshift(...result);
+                this.setState({ result: stateResult });
+            }
+        })
         !this.props.onItemClick && this._addHistory(text);
         !this.props.searchOnTextChange && Keyboard.dismiss();
         const result = this.props.doSearch(text).filter(i => i);
@@ -380,4 +400,4 @@ const styles = StyleSheet.create({
     separator: {
         height: StyleSheet.hairlineWidth,
     },
-});
\ No newline at end of file
+});
diff --git a/standard/component/image/clear.png b/standard/component/image/clear.png
new file mode 100644
index 0000000..12ba45b
Binary files /dev/null and b/standard/component/image/clear.png differ
diff --git a/standard/component/image/newUnreadMessage@3x.png b/standard/component/image/newUnreadMessage@3x.png
new file mode 100644
index 0000000..f76eddb
Binary files /dev/null and b/standard/component/image/newUnreadMessage@3x.png differ
diff --git a/standard/component/image/oldUnreadMessage@3x.png b/standard/component/image/oldUnreadMessage@3x.png
new file mode 100644
index 0000000..2330b75
Binary files /dev/null and b/standard/component/image/oldUnreadMessage@3x.png differ
diff --git a/standard/component/image/showMore@3x.png b/standard/component/image/showMore@3x.png
new file mode 100644
index 0000000..a1ebe97
Binary files /dev/null and b/standard/component/image/showMore@3x.png differ
diff --git a/standard/component/image/unreadMessageContainer@3x.png b/standard/component/image/unreadMessageContainer@3x.png
new file mode 100644
index 0000000..fe22c8a
Binary files /dev/null and b/standard/component/image/unreadMessageContainer@3x.png differ
diff --git a/standard/component/index.ts b/standard/component/index.ts
index a360b79..6ae46f9 100644
--- a/standard/component/index.ts
+++ b/standard/component/index.ts
@@ -16,6 +16,8 @@ import SeekBarSectionList from './SeekBarSectionList';
 import SegmentControl from './SegmentControl';
 import SelectList from './SelectList';
 import SettingItem from './SettingItem';
+import HeaderCell from './HeaderCell';
+import FixedSectionList from './FixedSectionList';
 
 export {
     AvatarImage,
@@ -36,4 +38,6 @@ export {
     SegmentControl,
     SelectList,
     SettingItem,
+    HeaderCell,
+    FixedSectionList,
 };
\ No newline at end of file
diff --git a/standard/delegate.tsx b/standard/delegate.tsx
index 8e20b44..f1d5621 100644
--- a/standard/delegate.tsx
+++ b/standard/delegate.tsx
@@ -76,6 +76,7 @@ const model: Delegate.ModelPart = {
         getOwner: noDataDelegate('model.Group.getOwner'),
         getMembers: noDataDelegate('model.Group.getMembers'),
         getName: noDataDelegate('model.Group.getName'),
+        getAnnouncement: noDataDelegate('model.Group.getAnnouncement'),
         getAvatar: noDataDelegate('model.Group.getAvatar'),
         getAllowInvites: noDataDelegate('model.Group.getAllowInvites'),
         createOne: noPromiseDelegate('model.Group.createOne'),
@@ -139,7 +140,6 @@ const config: Delegate.ConfigPart = {
     pinyinField: 'pinyin',
     titleLoading: '加载中',
     buttonOK: '确定',
-    maxContactLimitNumber: 5000,
     messageType: {
         text: -1,
         voice: -1,
@@ -158,4 +158,4 @@ export default {
     func,
     style,
     config,
-};
\ No newline at end of file
+};
diff --git a/standard/index.ts b/standard/index.ts
index afcb696..d34307a 100644
--- a/standard/index.ts
+++ b/standard/index.ts
@@ -1,4 +1,4 @@
-import AsyncStorage from 'react-native-general-storage';
+import AsyncStorage from '@hecom/storage';
 import * as Typings from './typings';
 import * as Model from './model';
 import * as Components from './component';
@@ -18,8 +18,10 @@ function setup_common_page() {
     Delegate.page[PageKeys.ContactList] = Pages.ContactListPage;
     Delegate.page[PageKeys.GroupList] = Pages.GroupListPage;
     Delegate.page[PageKeys.GroupMembers] = Pages.GroupMembersPage;
+    Delegate.page[PageKeys.GroupAnnouncementEdit] = Pages.GroupAnnouncementEditPage;
     Delegate.page[PageKeys.Search] = Pages.SearchPage;
     Delegate.page[PageKeys.SearchMore] = Components.SearchList;
+    Delegate.page[PageKeys.GroupNameEdit] = Pages.GroupNameEdit;
 }
 
 function setup_common_render() {
@@ -45,6 +47,8 @@ function setup_common_component() {
     Delegate.component.SegmentControl = Components.SegmentControl;
     Delegate.component.SelectList = Components.SelectList;
     Delegate.component.SettingItem = Components.SettingItem;
+    Delegate.component.HeaderCell = Components.HeaderCell;
+    Delegate.component.FixedSectionList = Components.FixedSectionList;
 }
 
 function setup_common_model() {
@@ -54,6 +58,7 @@ function setup_common_model() {
     Delegate.model.External = Model.External;
     Delegate.model.Group = Model.Group;
     Delegate.model.Message = Model.Message;
+    Delegate.model.Setting = Model.Setting;
 }
 
 function login(forceUpdate: boolean) {
@@ -84,4 +89,4 @@ export {
     setup_common_render,
     login,
     logout,
-};
\ No newline at end of file
+};
diff --git a/standard/model/conversation.ts b/standard/model/conversation.ts
index a7f1368..846a5e8 100644
--- a/standard/model/conversation.ts
+++ b/standard/model/conversation.ts
@@ -1,5 +1,5 @@
-import AsyncStorage from 'react-native-general-storage';
-import Listener from 'react-native-general-listener';
+import AsyncStorage from '@hecom/storage';
+import Listener from '@hecom/listener';
 import {Conversation, Event, Message, Storage} from '../typings';
 import * as Action from './action';
 import {simpleExport} from '../util';
@@ -29,7 +29,7 @@ export async function init(forceUpdate: boolean): Promise<void> {
     onUnreadCountChanged();
 }
 
-export async function uninit(forceClear: boolean): Promise<void> {
+export async function uninit(forceClear: boolean = true): Promise<void> {
     const imIds = Object.keys(rootNode);
     imIds.forEach(imId => delete rootNode[imId]);
     if (forceClear) {
@@ -246,7 +246,7 @@ export async function recallMessage(imId: string, message: Message.General): Pro
 function onUnreadCountChanged(): void {
     const count = Object.values(rootNode)
         .reduce((prv: number, cur: Conversation.Item) => {
-            const isAvoid = cur.config.avoid;
+            const isAvoid = !!cur && !!cur.config && cur.config.avoid;
             if (!isAvoid && isValid(cur.imId, cur.chatType)) {
                 prv += cur.unreadMessagesCount;
             }
@@ -270,4 +270,4 @@ function keys(imId?: string): string[] {
     } else {
         return [myUserId, name];
     }
-}
\ No newline at end of file
+}
diff --git a/standard/model/external.ts b/standard/model/external.ts
index 5c4aefc..578c9e7 100644
--- a/standard/model/external.ts
+++ b/standard/model/external.ts
@@ -1,4 +1,4 @@
-import Listener from 'react-native-general-listener';
+import Listener from '@hecom/listener';
 import { Message, Conversation, Event } from '../typings';
 import * as Action from './action';
 import delegate from '../delegate';
@@ -11,6 +11,17 @@ export interface ProcessedMessage<T extends Message.Body = Message.GeneralBody>
 export async function onMessageReceived(
     originMessage: Message.Origin
 ): Promise<ProcessedMessage> {
+    //语音消息插入未读标志
+    //语音消息插入未点击标志
+    const {ext} = originMessage;
+    if (ext &&
+        ext.extend_message_body &&
+        ext.extend_message_body.messageType &&
+        ext.extend_message_body.messageType == 5) {
+        originMessage.ext.shouldRead = true;
+        delegate.im.conversation.updateMessageExt(originMessage.messageId, originMessage.ext);
+    }
+
     const message = Action.Parse.get([], originMessage, originMessage);
     if (!message) {
         throw new Error('无法处理该消息');
@@ -20,8 +31,6 @@ export async function onMessageReceived(
     if (!delegate.model.Conversation.getOne(imId, false)) {
         await delegate.model.Conversation.loadItem(imId, chatType);
     }
-    const timeMessage = await delegate.model.Message.insertTimeMessage(imId, chatType, message);
-    timeMessage && Listener.trigger([Event.Base, Event.SendMessage, imId], timeMessage);
     await delegate.model.Conversation.updateMessage(imId, message);
     Listener.trigger(
         [Event.Base, Event.ReceiveMessage, imId],
@@ -88,6 +97,17 @@ export async function onUserLeave(
     await groupUpdateOperation(groupId, text, localTime, timestamp);
 }
 
+export async function onUserDidLeaveGroup(
+    group: object,
+    reason: number,
+){
+    if (reason == 0) {
+        await delegate.model.Conversation.deleteOne(group.groupId);
+        await delegate.model.Group.deleteOne(group.groupId);
+    }
+    Listener.trigger([Event.Base, Event.GroupLeave, group.groupId], {group: group, reason: reason});
+}
+
 export async function onUpdateName(
     groupId: string,
     updatorId: string,
@@ -133,4 +153,4 @@ export async function groupUpdateOperation(
     if (text && text.length > 0) {
         await delegate.model.Message.insertSystemMessage(groupId, Conversation.ChatType.Group, text, localTime, timestamp);
     }
-}
\ No newline at end of file
+}
diff --git a/standard/model/group.ts b/standard/model/group.ts
index 0e67d1b..4809b78 100644
--- a/standard/model/group.ts
+++ b/standard/model/group.ts
@@ -1,5 +1,5 @@
-import AsyncStorage from 'react-native-general-storage';
-import Listener from 'react-native-general-listener';
+import AsyncStorage from '@hecom/storage';
+import Listener from '@hecom/listener';
 import { Group, Event, Storage } from '../typings';
 import { simpleExport } from '../util';
 import delegate from '../delegate';
@@ -99,6 +99,11 @@ export function getName(groupId: string, autoConj: boolean = true): string | voi
     }
 }
 
+export function getAnnouncement(groupId: string): string {
+    const group = findByGroupId(groupId, false);
+    return (group && group.announcement) ? group.announcement : '';
+}
+
 export function getAvatar(groupId: string): string | void {
     const group = findByGroupId(groupId, false);
     return group ? group.avatar : null;
@@ -152,6 +157,15 @@ export async function changeName(groupId: string, newName: string): Promise<stri
     return changeGroupInfo(groupId, {name: newName}, newName);
 }
 
+export async function showGroupDataRecord(imId:string) {
+    await delegate.im.group.showGroupDataRecord(imId)
+}
+
+export async function changeAnnouncement(groupId: string, newAnnouncement: string): Promise<string> {
+    await delegate.im.group.changeAnnouncement(groupId, newAnnouncement);
+    return changeGroupInfo(groupId, {announcement: newAnnouncement}, newAnnouncement);
+}
+
 export async function changeAvatar(groupId: string, newAvatarUrl: string): Promise<string> {
     await delegate.im.group.changeAvatar(groupId, newAvatarUrl);
     return changeGroupInfo(groupId, {avatar: newAvatarUrl}, newAvatarUrl);
@@ -217,4 +231,4 @@ function keys(groupId?: string): string[] {
     } else {
         return [myUserId, name];
     }
-}
\ No newline at end of file
+}
diff --git a/standard/model/index.ts b/standard/model/index.ts
index 53353da..4d1dc6b 100644
--- a/standard/model/index.ts
+++ b/standard/model/index.ts
@@ -4,8 +4,10 @@ import * as Emoji from './emoji';
 import * as External from './external';
 import * as Group from './group';
 import * as Message from './message';
+import * as Quote from './quote';
 import Setting from './setting';
 
+
 export {
     Action,
     Conversation,
@@ -14,4 +16,5 @@ export {
     Group,
     Message,
     Setting,
+    Quote,
 };
\ No newline at end of file
diff --git a/standard/model/message.ts b/standard/model/message.ts
index f9e5c10..fc0a032 100644
--- a/standard/model/message.ts
+++ b/standard/model/message.ts
@@ -1,19 +1,18 @@
-import Listener from 'react-native-general-listener';
+import Listener from '@hecom/listener';
 import * as Action from './action';
 import { Message, Conversation, Event } from '../typings';
 import { guid } from '../util';
 import delegate from '../delegate';
 
 export const name = 'im-message';
-const interval = 3 * 60 * 1000;
 
 export async function sendMultiMessage(
     imId: string,
     chatType:Conversation.ChatType,
     messages: Array<Message.General> = []
 ):Promise<void> {
-    messages.forEach((message, index)=>{
-        sendMessage(imId, chatType, message, {}, false, index === 0);
+    messages.forEach((message)=>{
+        sendMessage(imId, chatType, message, {}, false);
     })
 }
 
@@ -23,17 +22,12 @@ export async function sendMessage(
     message: Message.General,
     ext: object = {},
     isSystem: boolean = false,
-    autoTimestamp: boolean = true,
 ): Promise<void> {
     ext = {...ext, innerId: message.innerId};
     const sendEventName = [Event.Base, Event.SendMessage, imId];
     if (!delegate.model.Conversation.getOne(imId, false)) {
         await delegate.model.Conversation.loadItem(imId, chatType);
     }
-    if (!isSystem && autoTimestamp){
-        const timeMessage = await insertTimeMessage(imId, chatType, message);
-        timeMessage && Listener.trigger(sendEventName, timeMessage);
-    }
     await delegate.model.Conversation.updateMessage(imId, message);
     // 事件发送之前，先触发通知，加入详情列表中，发送后再更新状态
     !isSystem && Listener.trigger(sendEventName, message);
@@ -46,67 +40,11 @@ export async function sendMessage(
         throw new Error('暂不支持发送该消息类型');
     }
     const newOriginMessage = await promise;
-    const newMessage = Action.Parse.get([], newOriginMessage, newOriginMessage);
+    const newMessage = newOriginMessage ? Action.Parse.get([], newOriginMessage, newOriginMessage) : message;
     Listener.trigger(sendEventName, newMessage);
     await delegate.model.Conversation.updateMessage(imId, newMessage);
 }
 
-export async function insertTimeMessage(
-    imId: string,
-    chatType: Conversation.ChatType,
-    message: Message.General,
-): Promise<Message.General | void> {
-    const conversation = delegate.model.Conversation.getOne(imId, false);
-    if (conversation && conversation.latestMessage) {
-        const oldMessage = conversation.latestMessage;
-        const delta = message.timestamp - oldMessage.timestamp;
-        if (delta < 0) {
-            const [forwardMessage] = await delegate.im.conversation.loadMessage({imId, chatType, lastMessage:message, count:1});
-            if (forwardMessage && message.timestamp - forwardMessage.timestamp < interval){
-                return;
-            }
-        } else if (delta < interval) {
-            const oldTime = new Date(oldMessage.timestamp).getMinutes();
-            const newTime = new Date(message.timestamp).getMinutes();
-            if (Math.floor(oldTime / 3) === Math.floor(newTime / 3)) {
-                return;
-            }
-        }
-    }
-    const promise = _insertTimeMessage(imId, chatType, message);
-    if (!promise) {
-        throw new Error('暂不支持发送该消息类型');
-    }
-    const newOriginMessage = await promise;
-    return Action.Parse.get([], newOriginMessage, newOriginMessage);
-}
-
-async function _insertTimeMessage(
-    imId: string,
-    chatType: Conversation.ChatType,
-    message: Message.General){
-    const timeMessage = {
-        conversationId: imId,
-        messageId: null,
-        innerId: guid(),
-        status: Message.Status.Succeed,
-        type: delegate.config.messageType.text,
-        from: delegate.user.getMine().userId,
-        to: imId,
-        localTime: Date.now() - 1,
-        timestamp: message.timestamp - 1,
-        data: {
-            text: '',
-            isSystem: true,
-        },
-    };
-    return Action.Send.get(
-        timeMessage.type,
-        {imId, chatType, message: timeMessage, ext: {}},
-        {imId, chatType, message: timeMessage, ext: {}},
-    );
-}
-
 export async function insertSystemMessage(
     imId: string,
     chatType: Conversation.ChatType,
diff --git a/standard/model/quote.ts b/standard/model/quote.ts
new file mode 100644
index 0000000..fa65298
--- /dev/null
+++ b/standard/model/quote.ts
@@ -0,0 +1,93 @@
+
+import { Message } from 'react-native-im/standard/typings';
+import delegate from '../../standard/delegate';
+import Navigation from '@hecom/navigation';
+import { Delegate } from '../../standard';
+import { showPhotoBrowserPage } from 'react-native-photo-browse';
+import Model from '../../../../core/model';
+import Constant from '../../../../core/constant';
+import { FilePreviewPageKey } from '../../../../standard/accessory/page/FilePreviewPage';
+import { VideoPlayPageKey } from '../../../../standard/accessory/page/VideoPlayPage';
+
+
+const MessageType = {
+    text: 1, // 文本消息
+    image: 2, // 图片消息
+    video: 3, // 视频消息
+    location: 4, // 位置消息
+    voice: 5, // 语音消息
+    file: 6, // 文件消息
+    cmd: 7, // CMD控制消息
+    material: 8, //资料(对象)
+};
+
+export const msgDescResolver = new Map([
+    [MessageType.text, _textMsgDescHandle],
+    [MessageType.image, _imgMsgDescHandle],
+    [MessageType.video, _videoMsgDescHandle],
+    [MessageType.location, _locationMsgDescHandle],
+    [MessageType.file, _fileMsgDescHandle],
+    [MessageType.material, _materialMsgDescHandle],
+])
+
+export const msgClickHandleResolver = new Map([
+    [MessageType.text, _textMsgClickHandle],
+    [MessageType.image, _imgMsgClickHandle],
+    [MessageType.video, _videoMsgClickHandle],
+    [MessageType.location, _locationClickHandle],
+    [MessageType.file, _fileMsgClickHandle],
+    [MessageType.material, _materialMsgClickHandle],
+])
+
+
+function _textMsgDescHandle(msg: Message.General): string {
+    return delegate.user.getUser((msg as Message.General).from).name + ':' + (msg as Message.General).data.text;
+}
+function _imgMsgDescHandle(msg: Message.General): string {
+    return delegate.user.getUser((msg as Message.General).from).name + ':[图片]';
+}
+function _videoMsgDescHandle(msg: Message.General): string {
+    return delegate.user.getUser((msg as Message.General).from).name + ':[视频]';
+}
+function _locationMsgDescHandle(msg: Message.General): string {
+    return delegate.user.getUser((msg as Message.General).from).name + ':[位置]';
+}
+function _fileMsgDescHandle(msg: Message.General): string {
+    return delegate.user.getUser((msg as Message.General).from).name + ':[文件]';
+}
+function _materialMsgDescHandle(msg: Message.General): string {
+    return delegate.user.getUser((msg as Message.General).from).name + ':[资料]';
+}
+
+function _textMsgClickHandle(msg: Message.General) {
+}
+function _imgMsgClickHandle(msg: Message.General) {
+    let img = (msg as Message.Image).data;
+    showPhotoBrowserPage({
+        currentIndex: 0,
+        images: [img.localPath ? img.localPath : img.remotePath],
+        canSave: true,
+        renderIndicator: () => null,
+    });
+}
+function _videoMsgClickHandle(msg: Message.General) {
+    let video = (msg as Message.Video).data;
+    Navigation.push(VideoPlayPageKey, { uri: video.remotePath ? video.remotePath : video.localPath });
+
+}
+function _locationClickHandle(msg: Message.General) {
+    let loc =((msg) as Message.Location).data;
+    Delegate.func.pushToLocationViewPage(loc);
+}
+function _fileMsgClickHandle(msg: Message.General) {
+    let file = (msg as Message.File).data;
+                Navigation.push(FilePreviewPageKey, { url: file.remotePath,name: file.name, size:file.size, inComponent: false });
+               
+}
+function _materialMsgClickHandle(msg: Message.General) {
+    let obj= msg.data.object;
+    Model.event.trigger(Constant.event.JumpToDetail, {
+        metaid: obj.metaName,
+        itemData: obj,
+    });
+}
\ No newline at end of file
diff --git a/standard/page/ChatDetail.tsx b/standard/page/ChatDetail.tsx
index bbe6b21..1ca7d84 100644
--- a/standard/page/ChatDetail.tsx
+++ b/standard/page/ChatDetail.tsx
@@ -1,31 +1,49 @@
 import React from 'react';
-import {Clipboard, Keyboard, SafeAreaView, StyleSheet, TouchableWithoutFeedback, View} from 'react-native';
-import {HeaderButton} from 'react-navigation-header-buttons';
+import {
+    Alert,
+    BackHandler,
+    Clipboard,
+    Image,
+    Keyboard,
+    SafeAreaView,
+    StyleSheet,
+    TouchableOpacity,
+    TouchableWithoutFeedback,
+    View
+} from 'react-native';
 import Toast from 'react-native-root-toast';
-import Listener from 'react-native-general-listener';
+import Listener from '@hecom/listener';
 import i18n from 'i18n-js';
 import * as PageKeys from '../pagekey';
 import * as Model from '../model';
 import {DateUtil, guid} from '../util';
 import {Conversation, Event, Message} from '../typings';
 import delegate from '../delegate';
+import {StackActions} from '@react-navigation/native';
+import {IMConstant} from 'react-native-im-easemob';
 
 interface ChatDetailProps {
     imId: string
     chatType: number
 }
 
-export default class extends React.PureComponent<ChatDetailProps> {
-    static navigationOptions = function ({navigation}) {
-        const {_title_, _right_} = navigation.state.params;
+export default class ChatDetail extends React.PureComponent<ChatDetailProps> {
+    static navigationOptions = function({ route }) {
+        const { _title_, _right_, _marginHorizontal_, _left_ } = route.params;
+        const titleContainerStyle = !!_marginHorizontal_ ? { marginHorizontal: _marginHorizontal_ } : {};
         return {
+            headerLeft: _left_,
             title: _title_,
             headerRight: _right_,
+            headerTitleContainerStyle: {
+                ...titleContainerStyle
+            },
         };
     };
 
     static defaultProps = {};
 
+    selectMessages= Array<Message.General>();
     listeners = new Array(5);
     isGroup: boolean;
     pageCount: number;
@@ -41,6 +59,8 @@ export default class extends React.PureComponent<ChatDetailProps> {
             menuShow: false,
             menuRef: null,
             actionList: [],
+            hasCheckBox: false,
+            refresh: false,
         };
     }
 
@@ -64,10 +84,12 @@ export default class extends React.PureComponent<ChatDetailProps> {
     }
 
     _registerListener = () => {
+        BackHandler.addEventListener('hardwareBackPress', this._onBackPress);
         [
             [Event.SendMessage, this._onReceiveMessage.bind(this)],
             [Event.ReceiveMessage, this._onReceiveMessage.bind(this)],
             this.isGroup && [Event.Group, this._setNaviBar.bind(this)],
+            [Event.GroupLeave, this._userLeave.bind(this)],
         ].filter(i => !!i).forEach(([eventType, func], index) => {
             this.listeners[index] = Listener.register(
                 [Event.Base, eventType, this.props.imId],
@@ -86,13 +108,72 @@ export default class extends React.PureComponent<ChatDetailProps> {
     };
 
     _unRegisterListener = () => {
-        this.listeners.forEach(listener => listener && listener.remove())
+        BackHandler.removeEventListener('hardwareBackPress', this._onBackPress);
+        this.listeners.forEach(listener => listener && listener.remove());
+    };
+
+    _onBackPress = () => {
+        const { hasCheckBox } = this.state;
+        if(hasCheckBox){
+            this.selectMessages.length=0;
+            this.setState({hasCheckBox:false});
+        }else {
+            this.props.navigation.goBack();
+        }
+        return true;
+    };
+
+    _onBatchForward = () => {
+        if (this.selectMessages.length < 1) {
+            Toast.show('请选择消息');
+            return;
+        }
+        this.selectMessages.forEach(value=>{
+            value.data.quoteMsg=undefined;
+        });
+        if (this.selectMessages.findIndex(msg => msg.type == delegate.config.messageType.voice) >= 0) {
+            Alert.alert('', '你选择的消息中，语音特殊消息不能转发给朋友，是否继续？', [
+                { text: '取消', onPress: null },
+                {
+                    text: '继续',
+                    onPress: () => {
+                        let removeIndex = this.selectMessages.findIndex(msg => msg.type == delegate.config.messageType.voice);
+                        while (removeIndex >= 0) {
+                            this.selectMessages.splice(removeIndex, 1);
+                            removeIndex = this.selectMessages.findIndex(msg => msg.type == delegate.config.messageType.voice);
+                        }
+                        if (this.selectMessages.length > 0) {
+                            this.props.navigation.navigate(PageKeys.ChooseConversation, {
+                                title: i18n.t('IMPageChooseConversationTitle'),
+                                onSelectData:
+                                    this._onSelectConversation.bind(this, this.selectMessages,()=>{
+                                        this.selectMessages.length = 0;
+                                        this.setState({ hasCheckBox: false });
+                                    }),
+                                excludedIds: [this.props.imId]
+                            });
+                        }
+
+                    }
+                }
+            ]);
+            return;
+        }
+        this.props.navigation.navigate(PageKeys.ChooseConversation, {
+            title: i18n.t('IMPageChooseConversationTitle'),
+            onSelectData:
+                this._onSelectConversation.bind(this, this.selectMessages,()=>{
+                    this.selectMessages.length = 0;
+                    this.setState({ hasCheckBox: false });
+                }),
+            excludedIds: [this.props.imId]
+        });
     };
 
     render() {
-        const {imId, chatType} = this.props;
+        const { imId, chatType } = this.props;
         return (
-            <View style={[styles.view, {backgroundColor: delegate.style.viewBackgroundColor}]}>
+            <View style={[styles.view, { backgroundColor: delegate.style.viewBackgroundColor }]}>
                 <SafeAreaView
                     style={styles.innerview}
                 >
@@ -111,6 +192,8 @@ export default class extends React.PureComponent<ChatDetailProps> {
                     onSendMultiMessage={this._onSendMultiMessage.bind(this, imId, chatType)}
                     onSendMessage={this._onSendMessage.bind(this, imId, chatType)}
                     navigation={this.props.navigation}
+                    batchOptionMode={this.state.hasCheckBox}
+                    onBatchForward={this._onBatchForward}
                 />
                 <delegate.component.MessageMenu
                     menuShow={this.state.menuShow}
@@ -123,50 +206,86 @@ export default class extends React.PureComponent<ChatDetailProps> {
     }
 
     _setNaviBar() {
-        const {imId} = this.props;
+        const { imId } = this.props;
         let title;
+        let marginHorizontal;
         if (this.isGroup) {
             const groupName = delegate.model.Group.getName(imId, false) || i18n.t('IMCommonChatTypeGroup');
             title = groupName + ' (' + delegate.model.Group.getMembers(imId).length + ')';
+            marginHorizontal = 97;
         } else {
             title = delegate.user.getUser(imId).name;
+            marginHorizontal = 50;
         }
         this.props.navigation.setParams({
+            _left_: this._renderLeftElement.bind(this),
             _title_: title,
-            _right_: this._renderRightElement(),
+            _right_: this._renderRightElement.bind(this),
+            _marginHorizontal_: marginHorizontal
         });
     }
 
     _renderContent() {
+        const {imId} = this.props;
+        const conversation = delegate.model.Conversation.getOne(imId, false)
         return (
             <View style={styles.container}>
                 <delegate.component.DetailListView
                     key={this.state.listKey}
                     ref={ref => this.list = ref}
                     style={styles.fixedList}
-                    renderItem={this._renderItem.bind(this)}
+                    renderItem={this._renderItem}
                     onLoadPage={this._refresh.bind(this)}
+                    oldUnreadMessageCount={Math.min(100, (!conversation ? 0 : conversation.unreadMessagesCount))}
                 />
-                <View style={styles.flexList} />
+                <View style={styles.flexList}/>
             </View>
         );
     }
 
+    _renderLeftElement() {
+        const { navigation } = this.props;
+        const backImage = require('./image/nav_back.png');
+        return (<TouchableOpacity
+                onPress={() => {
+                    const { hasCheckBox } = this.state;
+                    if(hasCheckBox){
+                        this.selectMessages.length=0;
+                        this.setState({hasCheckBox:false});
+                    }else {
+                        navigation.goBack();
+                    }
+                }}
+                activeOpacity={0.8}
+            >
+                <Image
+                    source={backImage}
+                    style={styles.leftImage}
+                />
+            </TouchableOpacity>
+        );
+    }
+
     _renderRightElement() {
-        return (
-            <HeaderButton
-                title={i18n.t('IMPageChatDetailSetting')}
+        const {imId, chatType} = this.props;
+        const onSendMsg = this._onSendMessage.bind(this, imId, chatType)
+        const moreImage = require('./image/showMore.png');
+        return (<TouchableOpacity
                 onPress={() => {
-                    this.props.navigation.navigate({
-                        routeName: PageKeys.ChatSetting,
-                        params: {
-                            imId: this.props.imId,
-                            chatType: this.props.chatType,
-                        },
+                    this.props.navigation.navigate(PageKeys.ChatSetting, {
+                        imId: imId,
+                        chatType: chatType,
+                        onSendMessage: onSendMsg,
                     });
                 }}
-            />
-        );
+                activeOpacity={0.8}
+            >
+                <Image
+                    source={moreImage}
+                    style={styles.rightImage}
+                />
+            </TouchableOpacity>
+        )
     }
 
     _setKeyboardStatus(status) {
@@ -179,29 +298,54 @@ export default class extends React.PureComponent<ChatDetailProps> {
         });
     }
 
-    protected async _refresh(oldData) {
+    protected async _refresh(oldData, pageSize = this.pageCount) {
         const isFirst = !oldData || oldData.length <= 0;
         const lastMessage = isFirst ? undefined : this.lastMessage;
         const loadPromise = delegate.im.conversation.loadMessage({
             imId: this.props.imId,
             chatType: this.props.chatType,
             lastMessage: lastMessage,
-            count: this.pageCount,
+            count: pageSize,
         });
         const markPromise = this._markAllRead();
-        let [result] = await Promise.all([loadPromise, markPromise]);
-        result = result
+        let [message] = await Promise.all([loadPromise, markPromise]);
+        const result = message
             .map(item => Model.Action.Parse.get(undefined, item, item))
+            // 历史数据中存在的时间消息可能导致isEnd计算错误
+            .filter((item) => !!item && !(item.data.isSystem && item.data.text.length <= 0))
             .sort((a, b) => a.timestamp >= b.timestamp ? -1 : 1);
         if (result && result.length > 0) {
             this.lastMessage = result[result.length - 1];
         }
         return {
             data: result,
-            isEnd: result.length < this.pageCount,
+            isEnd: message.length < pageSize,
         };
     }
 
+    _userLeave(data) {
+        const { reason } = data;
+        let message = '';
+        if (reason == 0) {
+            message = '您已被移出群聊';
+        } else if (reason == 2) {
+            message = '群聊已解散';
+        }
+
+        if (message.length > 0) {
+            this._unRegisterListener();
+            Alert.alert('提示', message, [
+                {
+                    text: i18n.t('IMCommonOK'), onPress: () => {
+                        this.props.navigation.dispatch(
+                            StackActions.popToTop({})
+                        );
+                    }
+                },
+            ]);
+        }
+    }
+
     _insertMessageToList(message) {
         console.log(message);
         const messages = Array.isArray(message) ? message : [message];
@@ -218,12 +362,12 @@ export default class extends React.PureComponent<ChatDetailProps> {
         this._sendMessage(imId, chatType, messages, delegate.model.Message.sendMultiMessage);
     }
 
-    _onSendMessage(imId, chatType, {type, body, ...other}) {
+    _onSendMessage(imId, chatType, { type, body, ...other }, sendCallBackFunc?) {
         const message = this._generateMessage(type, body, other);
-        this._sendMessage(imId, chatType, message, delegate.model.Message.sendMessage);
+        this._sendMessage(imId, chatType, message, delegate.model.Message.sendMessage, sendCallBackFunc);
     }
 
-    _sendMessage(imId, chatType, message, sendFunc) {
+    _sendMessage(imId, chatType, message, sendFunc, sendCallBackFunc?) {
         const isCurrent = this.props.imId === imId;
         sendFunc(imId, chatType, message)
             .then(() => {
@@ -234,11 +378,13 @@ export default class extends React.PureComponent<ChatDetailProps> {
                         action: i18n.t('IMCommonSendMessage')
                     }));
                 }
+                sendCallBackFunc&&sendCallBackFunc();
             })
             .catch(() => {
                 Toast.show(i18n.t('IMToastError', {
                     action: i18n.t('IMCommonSendMessage')
                 }));
+                sendCallBackFunc&&sendCallBackFunc();
             });
     }
 
@@ -250,12 +396,15 @@ export default class extends React.PureComponent<ChatDetailProps> {
         const canRecall = interval < 5 * 60;
         if (messageType === delegate.config.messageType.text) {
             actionList.push({title: '复制', action: this._onCopy.bind(this, message)});
-            this.isGroup && !isSender && actionList.push({
+        }
+        if (messageType != delegate.config.messageType.voice){
+            actionList.push({
                 title: '引用',
                 action: this._onQuote.bind(this, message)
             });
         }
         actionList.push({title: '转发', action: this._onForward.bind(this, message)});
+        actionList.push({ title: '多选', action: this._onForwardMultiMessage.bind(this, message) });
         if (isSender && canRecall) {
             actionList.push({title: '撤回', action: this._onRecall.bind(this, message)});
         }
@@ -273,16 +422,15 @@ export default class extends React.PureComponent<ChatDetailProps> {
     _onCopy(message) {
         const text = message.data.text;
         Clipboard.setString(text);
+        Toast.show('复制成功');
     }
 
     _onForward(message) {
-        this.props.navigation.navigate({
-            routeName: PageKeys.ChooseConversation,
-            params: {
-                title: i18n.t('IMPageChooseConversationTitle'),
-                onSelectData: this._onSelectConversation.bind(this, message),
-                excludedIds: [this.props.imId],
-            },
+        message.data.quoteMsg=undefined;
+        this.props.navigation.navigate(PageKeys.ChooseConversation, {
+            title: i18n.t('IMPageChooseConversationTitle'),
+            onSelectData: this._onSelectConversation.bind(this, message,undefined),
+            excludedIds: [this.props.imId]
         });
     }
 
@@ -298,15 +446,30 @@ export default class extends React.PureComponent<ChatDetailProps> {
     }
 
     _onQuote(item) {
-        this.bottomBar.changeInputText(item.from, item.data.text);
+        // this.bottomBar.changeInputText(item.from, item.data.text);
+        this.bottomBar.quoteMsg(item);
     }
 
-    _onSelectConversation(message, conversations) {
-        this._onSendMessage(
-            conversations[0].imId,
-            conversations[0].chatType,
-            {...message, body: message.data}
-        );
+    _onSelectConversation(message, sendCallBackFunc, conversations) {
+        if (message instanceof Array) {
+            message.forEach((value, index, array) => {
+                const {messageId,innerId, ...others}=value
+                this._onSendMessage(
+                    conversations[0].imId,
+                    conversations[0].chatType,
+                    { ...others, body: value.data },
+                    index === message.length - 1 ? sendCallBackFunc : undefined
+                );
+            });
+        } else {
+            const {messageId,innerId, ...others}=message
+            this._onSendMessage(
+                conversations[0].imId,
+                conversations[0].chatType,
+                { ...others, body: message.data },
+                sendCallBackFunc
+            );
+        }
     }
 
     protected async _markAllRead() {
@@ -314,26 +477,46 @@ export default class extends React.PureComponent<ChatDetailProps> {
         return await delegate.model.Conversation.markReadStatus(imId, chatType, true);
     }
 
-    _renderItem({item}, messageList) {
+    _renderItem=({ item, index }, messageList) => {
         const isMe = item.from === delegate.user.getMine().userId;
         const position = item.data.isSystem ? 0 : isMe ? 1 : -1;
+        const { hasCheckBox } = this.state;
         if (item.data.isSystem && item.data.text.length <= 0) {
-            item.data.text = DateUtil.showDateTime(item.timestamp, true);
+            return <View/>
         }
         return (
             <delegate.component.BaseMessage
                 imId={this.props.imId}
                 chatType={this.props.chatType}
                 position={position}
+                showTime={DateUtil.needShowTime(messageList[index + 1], item)}
                 message={item}
+                hasCheckBox={hasCheckBox}
+                isSelected={this._isMessageSelected(item)}
                 messages={messageList}
+                changeSelectState={this._onChangeSelectState}
                 onShowMenu={this._onShowMenu.bind(this)}
                 navigation={this.props.navigation}
+                onLongPressAvatar={this._onLongPressAvatar}
             />
         );
     }
 
+    _onLongPressAvatar = (params: Message.General) => {
+        if (this.props.chatType !== Conversation.ChatType.Group) {
+            return;
+        }
+        const isMe = params.from === delegate.user.getMine().userId;
+        const canResponse = params.data.isSystem ? 0 : isMe ? 0 : 1;
+        if (canResponse) {
+            this.bottomBar.insertAtMember([params.from])
+        }
+    }
+
     _generateMessage(type, body, others = {}) {
+        if (type == IMConstant.MessageType.image && body && body.mineType && body.mineType.startsWith('video')) {
+            type = IMConstant.MessageType.video;
+        }
         return {
             conversationId: this.props.imId,
             messageId: undefined,
@@ -348,6 +531,42 @@ export default class extends React.PureComponent<ChatDetailProps> {
             ...others,
         };
     }
+
+    _onForwardMultiMessage(msg: Message.General) {
+        this.selectMessages.push(msg);
+        this._switchMultiSelect();
+    }
+
+    _switchMultiSelect = () => {
+        const { hasCheckBox: oldCheckState } = this.state;
+        this.setState({
+            hasCheckBox: !oldCheckState
+        });
+    };
+
+    _isMessageSelected=(msg: Message.General)=>{
+        const removeIndex = this.selectMessages.findIndex(((value, index, iter) => value.messageId===msg.messageId));
+        return removeIndex>=0;
+    }
+
+    _onChangeSelectState=(oriState:boolean,msg: Message.General)=>{
+        if(oriState){
+            this._unSelectMessage(msg);
+        }else {
+            this._selectMessage(msg)
+        }
+    }
+
+    _selectMessage = (msg: Message.General) => {
+        this.selectMessages.push(msg);
+        this.setState({ refresh: !this.state.refresh });
+    };
+
+    _unSelectMessage = (msg: Message.General) => {
+        const removeIndex = this.selectMessages.findIndex(((value, index, iter) => value.messageId === msg.messageId));
+        this.selectMessages.splice(removeIndex,1);
+        this.setState({ refresh: !this.state.refresh });
+    }
 }
 
 const styles = StyleSheet.create({
@@ -369,4 +588,14 @@ const styles = StyleSheet.create({
     container: {
         flex: 1,
     },
-});
\ No newline at end of file
+    rightImage: {
+        width: 24,
+        height: 24,
+        right: 10,
+    },
+    leftImage: {
+        marginLeft: 14,
+        width: 18,
+        height: 16,
+    }
+});
diff --git a/standard/page/ChatList.tsx b/standard/page/ChatList.tsx
index 1e3ad02..9779172 100644
--- a/standard/page/ChatList.tsx
+++ b/standard/page/ChatList.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { StyleSheet, Text, TouchableOpacity, View } from 'react-native';
 import { SwipeListView } from 'react-native-swipe-list-view';
 import Toast from 'react-native-root-toast';
-import Listener from 'react-native-general-listener';
+import Listener from '@hecom/listener';
 import i18n from 'i18n-js';
 import * as PageKeys from '../pagekey';
 import { Event } from '../typings';
@@ -32,6 +32,10 @@ export default class extends React.PureComponent {
             [Event.Base, Event.Conversation],
             this._refresh.bind(this)
         );
+        this.listenUserLeave = Listener.registerWithSubEvent(
+            [Event.Base, Event.GroupLeave],
+            this._userLeave.bind(this)
+        );
     }
 
     componentWillUnmount() {
@@ -39,6 +43,10 @@ export default class extends React.PureComponent {
             [Event.Base, Event.Conversation],
             this.listenListUpdate
         );
+        Listener.unregister(
+            [Event.Base, Event.GroupLeave],
+            this.listenUserLeave
+        );
     }
 
     render() {
@@ -133,6 +141,13 @@ export default class extends React.PureComponent {
         this.setState({dataSource});
     }
 
+    _userLeave(data){
+        const {reason} = data;
+        if (reason == 0) {
+            this._refresh.bind(this);
+        }
+    }
+
     _clickTop(item, config) {
         const top = !config.top;
         delegate.model.Conversation.updateConfig(item.imId, item.chatType, {top})
@@ -150,10 +165,7 @@ export default class extends React.PureComponent {
     }
 
     _clickSearch() {
-        this.props.navigation.navigate({
-            routeName: PageKeys.Search,
-            params: {},
-        });
+        this.props.navigation.navigate(PageKeys.Search,{});
     }
 }
 
diff --git a/standard/page/ChatSetting.tsx b/standard/page/ChatSetting.tsx
index 47bb2f0..0868374 100644
--- a/standard/page/ChatSetting.tsx
+++ b/standard/page/ChatSetting.tsx
@@ -1,26 +1,19 @@
 import React from 'react';
 import { ScrollView, StyleSheet, View } from 'react-native';
-import { getSafeAreaInset } from 'react-native-pure-navigation-bar';
+import { getSafeAreaInset } from '@hecom/react-native-pure-navigation-bar';
 import i18n from 'i18n-js';
 import * as Model from '../model';
 import { Conversation } from '../typings';
 import delegate from '../delegate';
 
 export default class extends React.PureComponent {
-    static navigationOptions = function ({navigation}) {
-        const {chatType} = navigation.state.params;
+    static navigationOptions = function ({route}) {
+        const {chatType} = route.params;
         const isGroup = chatType === Conversation.ChatType.Group;
         const title = isGroup ? i18n.t('IMPageChatSettingTitleGroup') : i18n.t('IMPageChatSettingTitleSingle');
         return {title};
     };
 
-    // static propTypes = {
-    //     ...Types.BasicConversation,
-    //     ...Types.Navigation,
-    //     sections: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.string)),
-    //     buttons: PropTypes.arrayOf(PropTypes.string),
-    // };
-
     static defaultProps = {
         sections: [],
         buttons: [],
@@ -48,6 +41,7 @@ export default class extends React.PureComponent {
     _renderSections() {
         const views = [];
         this.props.sections.forEach((section, index) => {
+            
             const items = this._renderItems(section, this._renderHorizontalLine.bind(this));
             if (items.length > 0) {
                 views.push((
diff --git a/standard/page/ChooseConversation.tsx b/standard/page/ChooseConversation.tsx
index 0dbab99..0aa35d8 100644
--- a/standard/page/ChooseConversation.tsx
+++ b/standard/page/ChooseConversation.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Image, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
 import PropTypes from 'prop-types';
-import PickList, { PickListRowUtil } from 'react-native-picklist';
+import PickList, { PickListRowUtil } from '@hecom/react-native-picklist';
 import i18n from 'i18n-js';
 import * as PageKeys from '../pagekey';
 import delegate from '../delegate';
@@ -134,24 +134,21 @@ export default class extends React.PureComponent {
     }
 
     _clickHeader() {
-        this.props.navigation.navigate({
-            routeName: PageKeys.ChooseUser,
-            params: {
+        this.props.navigation.navigate(PageKeys.ChooseUser, {
                 title: i18n.t('IMPageChooseConversationCreateNew'),
                 multiple: true,
                 onSelectData: this._onCreateNew.bind(this),
                 selectedIds: [],
-            },
-        });
+            });
     }
 
-    _onCreateNew(data) {
+    _onCreateNew(data, label) {
         if (!data || data.length <= 0) {
             return;
         }
         delegate.model.Conversation.createOne(data)
             .then(({imId, chatType}) => {
-                const items = [{imId, chatType}];
+                const items = [{imId, chatType, label}];
                 this.props.onSelectData && this.props.onSelectData(items);
                 this.props.navigation.goBack();
             });
diff --git a/standard/page/ChooseUser.tsx b/standard/page/ChooseUser.tsx
index 7595142..bc399fd 100644
--- a/standard/page/ChooseUser.tsx
+++ b/standard/page/ChooseUser.tsx
@@ -1,16 +1,17 @@
 import React from 'react';
-import { InteractionManager, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
+import { InteractionManager, StyleSheet, Text, TouchableOpacity, View, Image } from 'react-native';
 import PropTypes from 'prop-types';
 import Toast from 'react-native-root-toast';
-import PickList from 'react-native-picklist';
+import PickList from '@hecom/react-native-picklist';
 import i18n from 'i18n-js';
 import ArrowImage from '@hecom/image-arrow';
 import ChooseUserFromOrgPage from './ChooseUserFromOrg';
 import delegate from '../delegate';
 import * as Types from '../proptype';
 import * as PageKeys from '../pagekey';
+import { Message } from '../typings';
 
-export default class extends React.PureComponent {
+export default class extends React.Component {
     static navigationOptions = function (options) {
         if (PickList.initialized(options)) {
             return PickList.navigationOptions(options);
@@ -28,13 +29,16 @@ export default class extends React.PureComponent {
 
     static defaultProps = {
         ...ChooseUserFromOrgPage.defaultProps,
+        showAtAll: false,
     };
 
     constructor(props) {
         super(props);
         this.state = {
             users: props.dataSource,
+ 	        selectedIds: props.selectedIds
         };
+	   this.idKey = 'userId';
     }
 
     componentDidMount() {
@@ -60,17 +64,18 @@ export default class extends React.PureComponent {
     }
 
     render() {
-        const {navigation, title, selectedIds, multiple, dataSource} = this.props;
+        const {navigation, title, selectedIds, multiple, dataSource, showBottomView} = this.props;
         return this.state.users !== undefined && (
             <PickList
+		ref={(ref) => (this.pickList = ref)}
                 navigation={navigation}
                 title={title}
                 multilevel={false}
                 multiselect={multiple}
-                showBottomView={false}
+                showBottomView={showBottomView}
                 data={this.state.users}
                 onFinish={this._onFinish.bind(this)}
-                renderHeader={dataSource ? undefined : this._renderHeader.bind(this)}
+                renderHeader={this._renderHeader.bind(this)}
                 rightTitle={multiple ? delegate.config.buttonOK : undefined}
                 searchKeys={[delegate.config.pinyinField]}
                 labelKey={'name'}
@@ -81,6 +86,9 @@ export default class extends React.PureComponent {
                     initialNumToRender: 20,
                     renderSectionHeader: this._renderSectionHeader.bind(this),
                 }}
+		        customView={this._getCustomView}
+                refreshSingleCell= {false}
+                renderRow={this._renderRow}
             />
         );
     }
@@ -99,11 +107,16 @@ export default class extends React.PureComponent {
     }
 
     _renderHeader() {
-        const style = {
-            borderBottomWidth: StyleSheet.hairlineWidth,
-            borderBottomColor: delegate.style.separatorLineColor,
-        };
-        return (
+        const {dataSource, showAtAll} = this.props;
+        const atAllView = showAtAll ? (
+            <TouchableOpacity onPress={this._onAtAll.bind(this)}>
+                <View style={{ backgroundColor: 'white', height: 40, flexDirection: 'row', alignItems: 'center' }}>
+                    <Text style={{ fontSize: 15, color: '#222', flex: 1, marginLeft: 12 }}>{'所有人'}</Text>
+                    <Image style={{ marginRight: 25, marginLeft: 10 }} source={require('./image/checkbox.png')} />
+                </View>
+            </TouchableOpacity >
+        ) : undefined;
+        const fromOrgView = dataSource ? undefined : (
             <View style={styles.row}>
                 <TouchableOpacity onPress={this._clickHeader.bind(this)}>
                     <View style={[styles.container, style]}>
@@ -114,6 +127,16 @@ export default class extends React.PureComponent {
                     </View>
                 </TouchableOpacity>
             </View>
+        )
+        const style = {
+            borderBottomWidth: StyleSheet.hairlineWidth,
+            borderBottomColor: delegate.style.separatorLineColor,
+        };
+        return (
+            <View>
+                {atAllView}
+                {fromOrgView}
+            </View>
         );
     }
 
@@ -158,29 +181,58 @@ export default class extends React.PureComponent {
     }
 
     _onFinish(nodes) {
+        this._selectedOnFinish(nodes);
+        let label = '';
         nodes = nodes
             .reduce((prv, cur) => [...prv, ...cur.getLeafChildren()], [])
-            .map(node => node.getInfo().userId);
-        this.props.onSelectData && this.props.onSelectData(nodes);
+            .map(node => {
+                const nodeInfo = node.getInfo();
+                label = label.length > 0 ? label + '、' : label;
+                label =  label + nodeInfo.name;
+                return nodeInfo.userId;
+            });
+        this.props.onSelectData && this.props.onSelectData(nodes, label);
+    }
+
+    _onAtAll() {
+        this.props.onSelectData && this.props.onSelectData([Message.AtAll], i18n.t('IMPageChooseUserAll'));
+        this.props.navigation && this.props.navigation.goBack();
     }
 
     _clickHeader() {
-        const onSelectDataFunc = (nodes) => {
+        const selectedIds = this._getCurrentSelectedIdKeys('userId');
+        const onSelectDataFunc = (nodes, notBack = false) => {
+            if (notBack) {
+                this._refreshBackData(nodes, this.idKey);
+                return;
+            }
             this.props.onSelectData && this.props.onSelectData(nodes);
             InteractionManager.runAfterInteractions(() => {
                 this.props.navigation.goBack();
             });
         };
-        const {title, multiple, hasSelf, parentOrgId, excludedUserIds, selectedIds, spaceHeight} = this.props;
-        this.props.navigation.navigate({
-            routeName: PageKeys.ChooseUserFromOrg,
-            params: {
-                title, multiple, hasSelf, parentOrgId, excludedUserIds, selectedIds, spaceHeight,
-                firstTitleLine: delegate.user.getMine().entName,
-                onSelectData: onSelectDataFunc,
-            },
+        const { title, multiple, hasSelf, parentOrgId, excludedUserIds, spaceHeight } = this.props;
+        this.props.navigation.navigate(PageKeys.ChooseUserFromOrg, {
+            title,
+            multiple,
+            hasSelf,
+            parentOrgId,
+            excludedUserIds,
+            selectedIds,
+            spaceHeight,
+            firstTitleLine: delegate.user.getMine().entName,
+            onSelectData: onSelectDataFunc,
         });
     }
+    _getCustomView  = (data, renderRow) => null;
+
+    _renderRow  = (treeNode, props) => null;
+
+    _selectedOnFinish = (nodes) => null;
+
+    _getCurrentSelectedIdKeys = (idKey) => [];
+
+    _refreshBackData = (nodes) => []
 }
 
 const styles = StyleSheet.create({
@@ -212,4 +264,4 @@ const styles = StyleSheet.create({
         marginLeft: 10,
         marginRight: 0,
     },
-});
\ No newline at end of file
+});
diff --git a/standard/page/ChooseUserFromOrg.tsx b/standard/page/ChooseUserFromOrg.tsx
index 5d4e5a4..fedfa71 100644
--- a/standard/page/ChooseUserFromOrg.tsx
+++ b/standard/page/ChooseUserFromOrg.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
-import { View } from 'react-native';
+import { View, Text } from 'react-native';
 import PropTypes from 'prop-types';
 import Toast from 'react-native-root-toast';
-import PickList, { PickListRowUtil } from 'react-native-picklist';
+import PickList, { PickListRowUtil } from '@hecom/react-native-picklist';
 import i18n from 'i18n-js';
 import { deepExport } from '../util';
 import delegate from '../delegate';
@@ -82,10 +82,14 @@ export default class extends React.PureComponent<Props> {
     render() {
         const {navigation, title, firstTitleLine, selectedIds, multiple} = this.props;
         const {tree = []} = this.state;
-        let data, titleLine;
+        let data, titleLine, rawRootPath;
         if (tree.length === 1) {
             data = tree[0].children;
             titleLine = tree[0].name;
+
+            const detpPath = tree[0].dept ? tree[0].dept.path + '/' + tree[0].dept.code :
+                (tree[0].path ? tree[0].path : '');
+            rawRootPath = detpPath + '/' + tree[0].code;
         } else {
             data = tree;
             titleLine = firstTitleLine;
@@ -112,6 +116,18 @@ export default class extends React.PureComponent<Props> {
                     initialNumToRender: 30,
                     renderSectionFooter: this._renderSectionFooter.bind(this),
                 }}
+                firstRawRootPath={rawRootPath}
+                weakNodeTag={this._weakNodeTag}
+                rootPath={(root: any) => {
+                    if (root.firstRawRootPath) {
+                        return root.firstRawRootPath;
+                    }
+                    const detpPath = root.dept ? root.dept.path + '/' + root.dept.code : '';
+                    return detpPath + '/' + (root.code || '');
+                }}
+                parentPath={(root: any) => {
+                    return root.dept ? root.dept.path + '/' + root.dept.code : '';
+                }}
             />
         );
     }
@@ -130,11 +146,11 @@ export default class extends React.PureComponent<Props> {
             PickListRowUtil.multiLevelNotLeafNode(treeNode, props);
     }
 
-    _onFinish(nodes) {
+    _onFinish(nodes, notBack = false) {
         nodes = nodes
             .reduce((prv, cur) => [...prv, ...cur.getLeafChildren()], [])
             .map(node => node.getInfo().userId);
-        this.props.onSelectData && this.props.onSelectData(nodes);
+        this.props.onSelectData && this.props.onSelectData(nodes, notBack);
     }
 
     _selectable(treeNode) {
@@ -198,4 +214,25 @@ export default class extends React.PureComponent<Props> {
         }
         return tree;
     }
+
+    _weakNodeTag = () => {
+        return (
+            <View style={{
+                borderColor: '#1890FF',
+                borderWidth: 1,
+                borderRadius: 4,
+                justifyContent: 'center',
+                alignItems: 'center',
+                marginLeft: 5,
+            }}>
+                <Text style={{
+                    color: '#1890FF',
+                    paddingHorizontal: 2,
+                    fontSize: 13
+                }}>
+                    {'兼职'}
+                </Text>
+            </View>
+        )
+    };
 }
\ No newline at end of file
diff --git a/standard/page/ContactList.tsx b/standard/page/ContactList.tsx
index 065b269..01d1ce2 100644
--- a/standard/page/ContactList.tsx
+++ b/standard/page/ContactList.tsx
@@ -8,13 +8,14 @@ import {
     SafeAreaView,
     StyleSheet,
     TouchableOpacity,
-    View
+    View,
+    Dimensions
 } from 'react-native';
 import PropTypes from 'prop-types';
 import Toast from 'react-native-root-toast';
-import NaviBar, {forceInset} from 'react-native-pure-navigation-bar';
+import NaviBar, {forceInset} from '@hecom/react-native-pure-navigation-bar';
 import ArrowImage from '@hecom/image-arrow';
-import Listener from 'react-native-general-listener';
+import Listener from '@hecom/listener';
 import * as PageKeys from '../pagekey';
 import {mapListToSection} from '../util';
 import {Conversation, Event} from '../typings';
@@ -44,12 +45,18 @@ export default class extends React.PureComponent {
         InteractionManager.runAfterInteractions(() => {
             this._loadData();
         });
+        Dimensions.addEventListener('change', this._onOrientationChange.bind(this));
     }
 
     componentWillUnmount() {
         this.listener && Listener.unregister([Event.Base, Event.StarUserChange], this.listener);
+        Dimensions.removeEventListener('change', this._onOrientationChange.bind(this));
     }
 
+    _onOrientationChange = () => {
+        this.forceUpdate();
+    };
+
     render() {
         const style = {
             backgroundColor: delegate.style.viewBackgroundColor,
@@ -71,23 +78,42 @@ export default class extends React.PureComponent {
         );
     }
 
+    _rowRenderer = (data) => {
+        let subTitle = data.dept && data.dept.name;
+        if (data.title) {
+            subTitle += (subTitle ? ' | ' : '') + data.title
+        }
+        return (
+            <>
+                <delegate.component.ListCell
+                    avatar={{ imId: data.userId, chatType: Conversation.ChatType.Single }}
+                    title={data.name}
+                    subTitle={subTitle}
+                    right={this._renderRight(data)}
+                    onClick={this._clickItem.bind(this, data)}
+                />
+                {this.renderSeparator()}
+            </>
+        );
+    }
+
     _renderList = () => {
         const {itemHeight} = this.props;
+        const {items = []} = this.state;
+        let { width } = Dimensions.get("window");
         return (
-            <delegate.component.SeekBarSectionList
+            <delegate.component.FixedSectionList
                 style={styles.list}
                 sections={this.state.data}
-                renderItem={this._renderItem}
-                headerHeight={itemHeight * 3}
-                ItemSeparatorComponent={this.renderSeparator}
-                keyExtractor={item => item.userId}
-                ListHeaderComponent={this._renderHeader}
-                separatorHeight={StyleSheet.hairlineWidth}
-                stickySectionHeadersEnabled={true}
-                itemHeight={itemHeight}
+                renderItem={this._rowRenderer}
+                headerHeight={itemHeight * items.length}
+                renderHeaderComponent={this._renderHeader}
+                hasHeader={true}
+                itemHeight={itemHeight + StyleSheet.hairlineWidth}
                 sectionHeight={delegate.component.SectionHeader.defaultProps.height}
                 renderSectionHeader={this._renderSectionHeader}
-                initialNumToRender={20}
+                itemWidth= {width}
+                renderAheadOffset= {itemHeight * 20}
             />
         );
     };
@@ -96,18 +122,20 @@ export default class extends React.PureComponent {
         return <View style={styles.separator} />
     }
 
-    _renderSectionHeader = ({section: {title}}) => {
+    _renderSectionHeader = (title) => {
         return <delegate.component.SectionHeader title={title} />;
     };
 
     _renderHeader = () => {
-        return this.state.items.map(({title, subTitle, onClick, icon}, index) => (
-            <delegate.component.ListCell
+        return this.state.items.map(({title, subTitle, onClick, icon, showBranchTop, showBranchBottom}, index) => (
+            <delegate.component.HeaderCell
                 key={index}
                 title={title}
                 subTitle={subTitle}
                 onClick={onClick}
                 avatar={icon}
+                showBranchTop={showBranchTop}
+                showBranchBottom={showBranchBottom}
                 right={<ArrowImage style={styles.arrow} />}
             />
         ));
@@ -152,7 +180,7 @@ export default class extends React.PureComponent {
         return Promise.all([loadUser, loadOrg, loadStarUser])
             .then(([users, , starUsers = []]) => {
                 let data: Array<{}>;
-                if (users.length < delegate.config.maxContactLimitNumber) {
+                if (users.length < 100000) {
                     data = mapListToSection(users, delegate.config.pinyinField);
                     if (starUsers.length > 0) {
                         data.unshift({key: '☆', title: '星标好友', data: starUsers});
@@ -192,10 +220,7 @@ export default class extends React.PureComponent {
     };
 
     _clickSearchBar = () => {
-        this.props.navigation.navigate({
-            routeName: PageKeys.Search,
-            params: {},
-        });
+        this.props.navigation.navigate( PageKeys.Search, {});
     };
 
     _clickPhone = (phone) => {
diff --git a/standard/page/GroupAnnouncementEdit.tsx b/standard/page/GroupAnnouncementEdit.tsx
new file mode 100644
index 0000000..8a890e6
--- /dev/null
+++ b/standard/page/GroupAnnouncementEdit.tsx
@@ -0,0 +1,155 @@
+import React from 'react';
+import {Keyboard, Platform, ScrollView, StyleSheet, Text, TextInput, View} from 'react-native';
+import PropTypes from 'prop-types';
+import NaviBar, {getSafeAreaInset} from '@hecom/react-native-pure-navigation-bar';
+import {Delegate} from "react-native-im/standard/index";
+import Toast from "react-native-root-toast";
+import i18n from 'i18n-js';
+import Navigation from "@hecom/navigation/src/index";
+import {Message} from "react-native-im/standard/typings/index";
+import delegate from "react-native-im/standard/delegate";
+
+export default class extends React.PureComponent {
+    private keyboardDidShowListener: any;
+    private keyboardDidHideListener: any;
+    private isDisable = true
+
+    static propTypes = {
+        groupId: PropTypes.string.isRequired,
+        groupAnnouncement: PropTypes.string.isRequired,
+        canEdit: PropTypes.bool,
+        onDataChange: PropTypes.func.isRequired,
+    };
+
+    state = {
+        keyBoardHeight: 0,
+    }
+
+    componentWillMount() {
+        if (Platform.OS === 'ios') {
+            this.keyboardDidShowListener = Keyboard.addListener('keyboardDidShow', this._keyboardDidShow.bind(this));
+            this.keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', this._keyboardDidHide.bind(this));
+        }
+    }
+    componentWillUnmount() {
+        if (Platform.OS === 'ios') {
+            this.keyboardDidShowListener.remove();
+            this.keyboardDidHideListener.remove();
+        }
+    }
+    protected _keyboardDidShow(e) {
+        if (Platform.OS === 'ios') {
+            this.setState({
+                keyBoardHeight: e.endCoordinates.height
+            });
+        }
+    }
+    protected _keyboardDidHide() {
+        if (Platform.OS === 'ios') {
+            this.setState({
+                keyBoardHeight: 0
+            });
+        }
+    }
+
+    render() {
+        const {canEdit, groupAnnouncement} = this.props;
+        const rights = {};
+        if (canEdit) {
+            rights.rightElement = '保存';
+            if (this.isDisable) {
+                rights.rightElementDisable = true;
+            } else {
+                rights.onRight = this._onRight;
+            }
+        }
+        const safeArea = getSafeAreaInset();
+        const marginStyle = {marginBottom: Math.max(this.state.keyBoardHeight, 10) + safeArea.bottom};
+        return (
+            <View style={styles.container}>
+                <NaviBar title={'群公告'} {...rights} autoCloseKeyboard={true}/>
+                {canEdit ? (
+                    <TextInput
+                        style={[styles.input, marginStyle]}
+                        defaultValue={groupAnnouncement}
+                        maxLength={2000}
+                        multiline={true}
+                        placeholder='请输入群公告内容'
+                        onChangeText={(text) => {
+                            this.isDisable = false
+                            this.setState({text})
+                        }}
+                        autoFocus={canEdit}
+                    />
+                ) : (
+                    <ScrollView style={[styles.content, {marginBottom: safeArea.bottom}]} showsVerticalScrollIndicator={true}>
+                        <Text style={[styles.contentText]}>{groupAnnouncement}</Text>
+                    </ScrollView>
+                )}
+
+            </View>
+        );
+    }
+
+    protected _onRight = () => {
+        const {groupId, onDataChange} = this.props;
+        let announcement = this.state.text;
+        if (!announcement) {
+            announcement = ''
+        }
+        this.props.apiRefresh(true);
+        Delegate.model.Group.changeAnnouncement(groupId, announcement)
+            .then(() => {
+                this._onSendMessageText()
+                this.props.apiRefresh(false);
+                onDataChange();
+                Toast.show('保存成功');
+                Navigation.pop();
+            })
+            .catch(() => {
+                this.props.apiRefresh(false);
+                Toast.show(i18n.t('IMToastError', {
+                    action: i18n.t('IMSettingGroupAnnouncementChange'),
+                }));
+            });
+    };
+
+    protected _onSendMessageText() {
+        let msg = this.state.text;
+        if (msg.length > 0) {
+            msg = '@所有人' + '\n' + msg
+            const message = {
+                type: delegate.config.messageType.text,
+                body: {
+                    text: msg,
+                    atMemberList: Message.AtAll,
+                },
+            };
+            this.props.onSendMessage(message);
+        }
+    }
+}
+
+const styles = StyleSheet.create({
+    container: {
+        flex: 1,
+    },
+    input: {
+        flex: 1,
+        fontSize: 14,
+        marginTop: 10,
+        marginHorizontal: 12,
+        ...Platform.select({
+            android: { textAlignVertical: 'top' },
+        }),
+    },
+    content: {
+        flex: 1,
+    },
+    contentText: {
+        fontSize: 14,
+        color: '#333333',
+        marginHorizontal: 12,
+        marginTop: 10,
+    },
+});
diff --git a/standard/page/GroupList.tsx b/standard/page/GroupList.tsx
index 85fbbb6..ac51e9a 100644
--- a/standard/page/GroupList.tsx
+++ b/standard/page/GroupList.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { FlatList, SafeAreaView, StyleSheet, Text, View } from 'react-native';
-import NaviBar, { forceInset } from 'react-native-pure-navigation-bar';
-import Listener from 'react-native-general-listener';
+import NaviBar, { forceInset } from '@hecom/react-native-pure-navigation-bar';
+import Listener from '@hecom/listener';
 import Toast from 'react-native-root-toast';
 import * as PageKeys from '../pagekey';
 import { DateUtil } from '../util';
@@ -95,19 +95,14 @@ export default class extends React.PureComponent {
     };
 
     _clickItem = (item) => {
-        this.props.navigation.navigate({
-            routeName: PageKeys.ChatDetail,
-            params: {
+        this.props.navigation.navigate(PageKeys.ChatDetail, {
                 imId: item.groupId,
                 chatType: Conversation.ChatType.Group,
-            },
-        });
+            });
     };
 
     _clickFakeSearchBar = () => {
-        this.props.navigation.navigate({
-            routeName: PageKeys.SearchMore,
-            params: {
+        this.props.navigation.navigate(PageKeys.SearchMore,{
                 keyExtractor: item => item.groupId,
                 showHistory: false,
                 searchHint: '搜索群名称、群成员',
@@ -116,8 +111,7 @@ export default class extends React.PureComponent {
                 doSearch: this._search,
                 renderItem: this._renderSearchItem,
                 searchOnTextChange: true,
-            },
-        });
+            });
     };
 
     _refresh = () => {
diff --git a/standard/page/GroupMembers.tsx b/standard/page/GroupMembers.tsx
index 6c4f3f6..101b725 100644
--- a/standard/page/GroupMembers.tsx
+++ b/standard/page/GroupMembers.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { LayoutAnimation, StyleSheet, Text, View } from 'react-native';
 import PropTypes from 'prop-types';
-import NaviBar from 'react-native-pure-navigation-bar';
+import NaviBar from '@hecom/react-native-pure-navigation-bar';
 import SearchBar from 'react-native-general-searchbar';
 import ActionSheet from 'react-native-general-actionsheet';
 import * as PageKeys from '../pagekey';
@@ -147,16 +147,13 @@ export default class extends React.PureComponent {
     _onRight = () => {
         const excludedUserIds = this.allMembers
             .reduce((prv, cur) => prv.concat(cur.data.map(i => i.userId)), []);
-        this.props.navigation.navigate({
-            routeName: PageKeys.ChooseUser,
-            params: {
+        this.props.navigation.navigate( PageKeys.ChooseUser,{
                 title: '添加群成员',
                 multiple: true,
                 excludedUserIds: excludedUserIds,
                 selectedIds: [],
                 onSelectData: this._onAddMembers,
-            },
-        });
+            });
     };
 
     _onAddMembers = (memberIds) => {
diff --git a/standard/page/GroupNameEdit.tsx b/standard/page/GroupNameEdit.tsx
new file mode 100644
index 0000000..2c219e7
--- /dev/null
+++ b/standard/page/GroupNameEdit.tsx
@@ -0,0 +1,223 @@
+import React from 'react';
+import {Keyboard, Platform, Image ,StyleSheet, Text, TextInput, Dimensions, View} from 'react-native';
+import PropTypes from 'prop-types';
+import NaviBar, {getSafeAreaInset} from '@hecom/react-native-pure-navigation-bar';
+import {Delegate} from "react-native-im/standard/index";
+import Toast from "react-native-root-toast";
+import i18n from 'i18n-js';
+import Navigation from "@hecom/navigation/src/index";
+import delegate from "react-native-im/standard/delegate";
+
+const { width, height } = Dimensions.get('window');
+
+export default class extends React.PureComponent {
+    private keyboardDidShowListener: any;
+    private keyboardDidHideListener: any;
+    private isDisable = true
+
+    static propTypes = {
+        groupId: PropTypes.string.isRequired,
+        groupName: PropTypes.string.isRequired,
+        onDataChange: PropTypes.func.isRequired,
+    };
+
+    state = {
+        keyBoardHeight: 0,
+    }
+
+    componentWillMount() {
+        if (Platform.OS === 'ios') {
+            this.keyboardDidShowListener = Keyboard.addListener('keyboardDidShow', this._keyboardDidShow.bind(this));
+            this.keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', this._keyboardDidHide.bind(this));
+        }
+    }
+    componentWillUnmount() {
+        if (Platform.OS === 'ios') {
+            this.keyboardDidShowListener.remove();
+            this.keyboardDidHideListener.remove();
+        }
+    }
+    protected _keyboardDidShow(e) {
+        if (Platform.OS === 'ios') {
+            this.setState({
+                keyBoardHeight: e.endCoordinates.height
+            });
+        }
+    }
+    protected _keyboardDidHide() {
+        if (Platform.OS === 'ios') {
+            this.setState({
+                keyBoardHeight: 0
+            });
+        }
+    }
+
+    render() {
+        const { groupName } = this.props;
+        // const rights = {};
+        // rights.rightElement = '保存';
+        //     if (this.isDisable) {
+        //         rights.rightElementDisable = true;
+        //     } else {
+        //         rights.onRight = this._onRight;
+        //     }
+        const safeArea = getSafeAreaInset();
+        const marginStyle = {marginBottom: Math.max(this.state.keyBoardHeight, 10) + safeArea.bottom};
+        return (
+            <View style={styles.container}>
+                <NaviBar title={''} autoCloseKeyboard={true} hasSeperatorLine={false}/>
+                <Text style={styles.titleText}>{'修改群聊名称'}</Text>
+                <View style={styles.topLineView} />
+                <View style={styles.backView}>
+                    {this._renderIcon()}
+                    <TextInput
+                        style={styles.input}
+                        defaultValue={groupName}
+                        maxLength={2000}
+                        multiline={false}
+                        clearButtonMode={'while-editing'}
+                        placeholder='请输入群名'
+                        onChangeText={(text) => {
+                            this.isDisable = false
+                            this.setState({text})
+                        }}
+                        autoFocus={true}
+                    />
+                </View>
+                <View style={styles.bottomLineView} />
+                <View style={[styles.buttonView,marginStyle]}>
+                        <Text style={styles.button} onPress={() => {
+                            if (!this.isDisable) {
+                                this._onRight()
+                            } else {
+                                Navigation.pop();
+                            }
+                        }}>
+                            {'完成'}
+                        </Text>
+                    </View>
+            </View>
+        );
+    }
+
+    protected _onRight = () => {
+        // const {groupId, onDataChange} = this.props;
+        let newName = this.state.text;
+        if (!newName) {
+            newName = ''
+        }
+        this.props.apiRefresh(true);
+    
+            if (!newName || newName.length === 0) {
+                Toast.show(i18n.t('IMSettingGroupNameNotEmpty'));
+                return;
+            }
+            const {groupId, onDataChange} = this.props;
+            Delegate.model.Group.changeName(groupId, newName)
+                .then(() => {
+                    this.props.apiRefresh(false);
+                    onDataChange();
+                    Toast.show('保存成功');
+                    Navigation.pop();
+                })
+                .catch(() => {
+                    this.props.apiRefresh(false);
+                    Toast.show(i18n.t('IMToastError', {
+                        action: i18n.t('IMSettingGroupNameChange'),
+                    }));
+                });
+    };
+
+    _renderIcon = () => {
+        const {groupAvatar} = this.props;
+        const isAvatar = Object.prototype.isPrototypeOf(groupAvatar) && groupAvatar.imId;
+        if (isAvatar) {
+            return (
+                <Delegate.component.AvatarImage
+                    {...groupAvatar}
+                    style={styles.avatar}
+                />
+            );
+        } else {
+            const src = typeof groupAvatar === 'string' ?
+                {uri: delegate.func.fitUrlForAvatarSize(groupAvatar, 48)} :
+                groupAvatar;
+            return <Image style={styles.icon} source={src} />;
+        }
+    };
+}
+
+const styles = StyleSheet.create({
+    container: {
+        backgroundColor: 'white',
+        flex: 1,
+        position: 'absolute',
+        height: height,
+        width: width,
+    },
+    backView: {
+        top: 108,
+        left: 20,
+        width: width - 40,
+        flexDirection: 'row',
+        backgroundColor: 'white',
+    },
+    topLineView: {
+        height: 1,
+        width: width - 40,
+        left: 20,
+        top: 100,
+        backgroundColor: 'rgba(25,31,37,0.08)',
+    },
+    bottomLineView: {
+        height: 1,
+        width: width - 40,
+        left: 20,
+        top: 115,
+        backgroundColor: 'rgba(25,31,37,0.08)',
+    },
+    input: {
+        fontSize: 14,
+        justifyContent: 'center',
+        marginTop: 10,
+        marginHorizontal: 12,
+        ...Platform.select({
+            android: { textAlignVertical: 'top' },
+        }),
+        flex: 1,
+    },
+    avatar: {
+        
+    },
+    icon: {
+        height: 48,
+        width: 48,
+        borderRadius: 24,
+        overflow: 'hidden',
+    },
+    titleText: {
+        height: 40,
+        fontSize: 20,
+        fontWeight: 'bold',
+        textAlign:'center',
+        top: 60,
+        left: 0,
+        width: width,
+    },
+    button: {
+        color: 'rgba(24, 144, 255, 1)',
+        fontSize: 15,
+        textAlign: 'center',
+        width: 120,
+    },
+    buttonView: {
+        backgroundColor: 'rgba(25,31,37,0.08)',
+        height: 40,
+        width: 150,
+        borderRadius: 5,
+        alignItems: 'center',
+        justifyContent: 'center',
+        top: 150,
+        left: (width - 150)/2,
+    },
+});
diff --git a/standard/page/Search.tsx b/standard/page/Search.tsx
index a5ce2f2..bf70a77 100644
--- a/standard/page/Search.tsx
+++ b/standard/page/Search.tsx
@@ -45,6 +45,9 @@ export default class extends React.PureComponent {
 
     render() {
         const hints = [];
+        if (this.props.customHint) {
+            hints.push(...this.props.customHint);
+        }
         if (this.props.canSearchContact) {
             hints.push('员工');
         }
@@ -59,26 +62,28 @@ export default class extends React.PureComponent {
             itemKey: 'name',
             searchOnTextChange: true,
         };
-        const onFooterClick = ({title, searchText}) => {
-            this.props.navigation.navigate(PageKeys.SearchMore, {
-                ...props,
-                showHistory: false,
-                searchHint: title,
-                searchText: searchText,
-                maxSectionItemLength: 0,
-                doSearch: title === '通讯录' ? this._searchFromContacts : this._searchFromGroup,
-            });
-        };
         return (
             <delegate.component.SearchList
                 {...props}
                 doSearch={this._doSearch}
                 searchHint={hint}
-                onSectionFooterClick={onFooterClick}
+                onSectionFooterClick={this._onFooterClick.bind(this, props)}
+                doCustomSearch={this._doCustomSearch}
             />
         );
     }
 
+    _onFooterClick(props, { title, searchText }) {
+        this.props.navigation.navigate(PageKeys.SearchMore, {
+            ...props,
+            showHistory: false,
+            searchHint: title,
+            searchText: searchText,
+            maxSectionItemLength: 0,
+            doSearch: title === '通讯录' ? this._searchFromContacts : this._searchFromGroup,
+        });
+    };
+
     _doSearch = (text) => {
         const result = [];
         if (this.props.canSearchContact) {
@@ -90,6 +95,8 @@ export default class extends React.PureComponent {
         return result;
     };
 
+    _doCustomSearch = ()=>Promise.resolve()
+
     _searchFromGroup = (text) => {
         const result = this.groups
             .filter((group) => {
@@ -109,17 +116,38 @@ export default class extends React.PureComponent {
     };
 
     _searchFromContacts = (text) => {
-        const result = this.employees
-            .filter((user) => {
-                let r = false;
-                r = r || user.name.includes(text);
-                r = r || user.name_py && user.name_py.includes(text);
-                r = r || user.phone && user.phone.includes(text);
-                r = r || user.dept && user.dept.name && user.dept.name.includes(text);
-                r = r || user.email && user.email.toLowerCase().includes(text.toLowerCase());
-                return r;
-            })
-            .sort((a, b) => a.name_py ? a.name_py.localeCompare(b.name_py) : -1);
+        const poolDic: { [key: string]: number } = {
+        }
+        const resoultDic: { [key: string]: Array<any> } = {
+            _name_name_py_: [],
+            _phone_: [],
+            _dept_: [],
+            _email_: [],
+        }
+        for (let index = 0; index < this.employees.length; index++) {
+            const user: any = this.employees[index];
+            if (!!poolDic[user.code]) {
+                continue;
+            }
+            if ((user.name && user.name.includes(text)) ||
+                user.name_py && user.name_py.toLowerCase().includes(text.toLowerCase())) {
+                poolDic[user.code] = user;
+                resoultDic._name_name_py_.push(user);
+            } else if (user.phone && user.phone.includes(text)){
+                poolDic[user.code] = user;
+                resoultDic._phone_.push(user);
+            } else if (user.dept && user.dept.name && user.dept.name.includes(text)) {
+                poolDic[user.code] = user;
+                resoultDic._dept_.push(user);
+            } else if (user.email && user.email.toLowerCase().includes(text.toLowerCase())) {
+                poolDic[user.code] = user;
+                resoultDic._email_.push(user);
+            }
+        }
+        const result = Object.values(resoultDic).reduce((prv, cur) => {
+            return prv.concat(cur.sort((a, b) => a.name_py ? a.name_py.localeCompare(b.name_py) : -1));
+        }, []);
+        
         return result.length > 0 ? [{
             title: this.multi ? '通讯录' : undefined,
             data: result,
@@ -235,13 +263,10 @@ export default class extends React.PureComponent {
 
     _onItemClick = ({item}) => {
         const type = item.groupId ? Conversation.ChatType.Group : Conversation.ChatType.Single;
-        this.props.navigation.navigate({
-            routeName: PageKeys.ChatDetail,
-            params: {
+        this.props.navigation.navigate(PageKeys.ChatDetail,{
                 imId: item.groupId || item.userId,
                 chatType: type,
-            },
-        });
+            });
     };
 }
 
diff --git a/standard/page/image/checkbox@3x.png b/standard/page/image/checkbox@3x.png
new file mode 100644
index 0000000..72ebf40
Binary files /dev/null and b/standard/page/image/checkbox@3x.png differ
diff --git a/standard/page/image/nav_back@3x.png b/standard/page/image/nav_back@3x.png
new file mode 100644
index 0000000..4f1b4d1
Binary files /dev/null and b/standard/page/image/nav_back@3x.png differ
diff --git a/standard/page/image/showMore@3x.png b/standard/page/image/showMore@3x.png
new file mode 100644
index 0000000..a1ebe97
Binary files /dev/null and b/standard/page/image/showMore@3x.png differ
diff --git a/standard/page/index.ts b/standard/page/index.ts
index e557fb0..8789ed0 100644
--- a/standard/page/index.ts
+++ b/standard/page/index.ts
@@ -7,7 +7,9 @@ import ChooseUserFromOrgPage from './ChooseUserFromOrg';
 import ContactListPage from './ContactList';
 import GroupListPage from './GroupList';
 import GroupMembersPage from './GroupMembers';
+import GroupAnnouncementEditPage from './GroupAnnouncementEdit';
 import SearchPage from './Search';
+import GroupNameEdit from './GroupNameEdit';
 
 export {
     ChatDetailPage,
@@ -20,4 +22,6 @@ export {
     GroupListPage,
     GroupMembersPage,
     SearchPage,
-};
\ No newline at end of file
+    GroupAnnouncementEditPage,
+    GroupNameEdit,
+};
diff --git a/standard/pagekey.ts b/standard/pagekey.ts
index 7aa2843..6bf6bb7 100644
--- a/standard/pagekey.ts
+++ b/standard/pagekey.ts
@@ -7,5 +7,7 @@ export const ChooseUserFromOrg = 'IMChooseUserFromOrg';
 export const ContactList = 'IMContactList';
 export const GroupList = 'IMGroupList';
 export const GroupMembers = 'IMGroupMembers';
+export const GroupAnnouncementEdit = 'IMGroupAnnouncementEdit';
 export const Search = 'IMSearch';
-export const SearchMore = 'IMSearchMore';
\ No newline at end of file
+export const SearchMore = 'IMSearchMore';
+export const GroupNameEdit = 'IMGroupNameEdit';
diff --git a/standard/render/index.tsx b/standard/render/index.tsx
index feeefd2..319aa24 100644
--- a/standard/render/index.tsx
+++ b/standard/render/index.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import {Dimensions, StyleSheet} from 'react-native';
 import Badge from '@hecom/badge';
-import {getSafeAreaInset} from 'react-native-pure-navigation-bar';
+import {getSafeAreaInset} from '@hecom/react-native-pure-navigation-bar';
 
 function renderBadge(avoid, count) {
     const {width} = Dimensions.get('window');
diff --git a/standard/typings/Action/Setting.ts b/standard/typings/Action/Setting.ts
index 587b98b..29edded 100644
--- a/standard/typings/Action/Setting.ts
+++ b/standard/typings/Action/Setting.ts
@@ -1,6 +1,7 @@
 import React from 'react';
 import { ChatType } from '../Conversation';
 import { Navigation } from '../Props';
+import * as Message from "react-native-im/standard/typings/Message";
 
 export interface State {
     name: string;
@@ -13,6 +14,7 @@ export interface Params extends Navigation {
     imId: string;
     chatType: ChatType;
     onDataChange: () => void;
+    onSendMessage: (message: Message.General) => void;
 }
 
-export type Result = React.ReactElement<Params>;
\ No newline at end of file
+export type Result = React.ReactElement<Params>;
diff --git a/standard/typings/Component.ts b/standard/typings/Component.ts
index 3d350f8..2c70d2f 100644
--- a/standard/typings/Component.ts
+++ b/standard/typings/Component.ts
@@ -1,6 +1,7 @@
 import { StyleProp, ViewStyle, ImageURISource, ImageRequireSource } from 'react-native';
 import * as Props from './Props';
 import * as Message from './Message';
+import {Typings} from '../../standard'
 
 export interface AvatarImageProps extends Props.Conversation {
     style?: StyleProp<ViewStyle>;
@@ -11,6 +12,7 @@ export interface AvatarListProps extends Props.Navigation {
     data: string[];
     canAdd: boolean;
     canRemove: boolean;
+    tempProps: Typings.Action.Setting.Params;
     onAddMembers: (newMemberUserIds: string[]) => void;
     onRemoveMembers: (deletedMemberUserIds: string[]) => void;
 }
@@ -29,9 +31,14 @@ export interface ShowMenuParams {
 }
 
 export interface BaseMessageProps extends Props.Navigation, Props.Conversation {
+    isSelected: boolean;
+    hasCheckBox: boolean;
     position: number;
+    showTime: boolean;
     message: Message.General;
     onShowMenu: (params: ShowMenuParams) => void;
+    onLongPressAvatar:(params: Message.General) => void;
+    changeSelectState:(oriSelectState:boolean, msg: Message.General) => void;
 }
 
 export interface SendMessageParams<T = any> {
@@ -41,6 +48,8 @@ export interface SendMessageParams<T = any> {
 
 export interface BottomBarProps extends Props.Navigation, Props.Conversation {
     onSendMessage: (message: SendMessageParams) => void;
+    batchOptionMode: boolean;
+    onBatchForward:()=>void;
 }
 
 export interface ConversationCellProps extends Props.Navigation, Props.Conversation {
@@ -51,6 +60,7 @@ export interface MessageBubbleProps extends Props.Navigation, Props.Conversation
     isSender: boolean;
     message: Message.General;
     onShowMenu: (params: ShowMenuParams) => void;
+    touchable: boolean;
 }
 
 export interface MenuAction {
@@ -77,4 +87,4 @@ export interface SettingItemProps {
     data?: string | ImageURISource | ImageRequireSource | boolean | void;
     onPressLine?: () => void;
     onPressSwitch?: (status: boolean) => void;
-}
\ No newline at end of file
+}
diff --git a/standard/typings/Delegate.ts b/standard/typings/Delegate.ts
index 236658b..c14373d 100644
--- a/standard/typings/Delegate.ts
+++ b/standard/typings/Delegate.ts
@@ -55,6 +55,7 @@ export interface GroupModelPart {
     getOwner: (groupId: string) => string;
     getMembers: (groupId: string, hasOwner?: boolean) => string[];
     getName: (groupId: string, autoConj?: boolean) => string | void;
+    getAnnouncement: (groupId: string) => string;
     getAvatar: (groupId: string) => string | void;
     getAllowInvites: (groupId: string) => boolean;
     createOne: (memberUserIds: string[]) => Promise<Group.Item>;
@@ -64,33 +65,40 @@ export interface GroupModelPart {
     addMembers: (groupId: string, memberUserIds: string[]) => Promise<string[]>;
     removeMembers: (groupId: string, memberUserIds: string[]) => Promise<string[]>;
     changeName: (groupId: string, newName: string) => Promise<string>;
+    changeAnnouncement: (groupId: string, newAnnouncement: string) => Promise<string>;
     changeAvatar: (groupId: string, newAvatarUrl: string) => Promise<string>;
     changeAllowInvites: (groupId: string, allowInvites: boolean) => Promise<boolean>;
     changeOwner: (groupId: string, newOwnerId: string) => Promise<{ owner: string; members: string[] }>;
+    showGroupDataRecord: (imId: String) => Promise<void>;
 }
 
 export interface MessageModelPart {
     name: string,
     sendMessage: (imId: string, chatType: Conversation.ChatType, message: Message.General, ext: object, isSystem: boolean) => Promise<void>
     sendMultiMessage: (imId: string, chatType: Conversation.ChatType, messages: Array<Message.General>) => Promise<void>
-    insertTimeMessage: (imId: string, chatType: Conversation.ChatType, message: Message.General) => Promise<Message.General | void>
     insertSystemMessage: (imId: string, chatType: Conversation.ChatType, text: string, localTime: number, timestamp: number, innerId?: string) => Promise<void>
 }
 
 export interface EmojiModelPart {
     name: string,
+    getPartEmojis: (key: string) => any
 }
 
 export interface ExternalModelPart {
 
 }
 
+export interface ExternalModelSetting {
+
+}
+
 export interface ModelPart {
     Conversation: ConversationModelPart;
     Group: GroupModelPart;
     Message: MessageModelPart;
     Emoji: EmojiModelPart;
     External: ExternalModelPart;
+    Setting: ExternalModelSetting;
 }
 
 export interface ContactPart {
@@ -112,6 +120,8 @@ export interface ConversationApiPart {
     updateConfig: (imId: string, config: Conversation.ConfigUpdate) => Promise<Conversation.Config>;
     markAllRead: (imId: string, chatType: Conversation.ChatType) => Promise<void>;
     markLatestUnread: (imId: string, chatType: Conversation.ChatType) => Promise<void>;
+    deleteAllMessages: (imId: string, chatType: Conversation.ChatType) => Promise<void>;
+    updateMessageExt: (messageId: string, ext: Object) => Promise<void>;
     loadMessage: (params: {
         imId: string;
         chatType: Conversation.ChatType;
@@ -139,9 +149,11 @@ export interface GroupApiPart {
     addMembers: (groupId: string, memberUserIds: string[]) => Promise<void>;
     removeMembers: (groupId: string, memberUserIds: string[]) => Promise<void>;
     changeName: (groupId: string, newName: string) => Promise<void>;
+    changeAnnouncement: (groupId: string, newAnnouncement: string) => Promise<void>;
     changeAvatar: (groupId: string, newAvatarUrl: string) => Promise<void>;
     changeAllowInvites: (groupId: string, newAllowInvites: boolean) => Promise<void>;
     changeOwner: (groupId: string, newOwnerId: string) => Promise<void>;
+    showGroupDataRecord: (imId: String) => Promise<void>;
 }
 
 export interface ApiPart {
@@ -157,6 +169,8 @@ export interface FuncPart {
     pushToUserDetailPage: (userId: string) => void;
     fitUrlForAvatarSize: (avatar: string, size?: number) => string;
     getDefaultUserHeadImage: (userId?: string) => ImageURISource | ImageRequireSource;
+    playVideo: (uri: string) => void;
+    getVideoMetaData: (uri: string) => Promise<any>;
     // uploadImages: unset('func.uploadImages'),
 }
 
@@ -174,13 +188,9 @@ export interface ConfigPart {
     titleLoading: string;
     buttonOK: string;
     useStarUser?: boolean;
-    /**
-     * 通讯录列表最大限制数量，超过则不显示列表
-     */
-    maxContactLimitNumber: number;
     messageType: {
         text: number;
         voice: number;
         system: number;
     };
-}
\ No newline at end of file
+}
diff --git a/standard/typings/Event.ts b/standard/typings/Event.ts
index 3debb65..508d954 100644
--- a/standard/typings/Event.ts
+++ b/standard/typings/Event.ts
@@ -7,6 +7,7 @@ export const Base = '__im_inner_event__';
 export const Conversation = '__im_conversation__';
 export const UnreadCount = '__im_unread_count__';
 export const Group = '__im_group__';
+export const GroupLeave = '__im_group_leave__';
 export const SendMessage = '__im_send_message__';
 export const ReceiveMessage = '__im_receive_message__';
 export const StarUserChange = '__im_star_user_change__';
\ No newline at end of file
diff --git a/standard/typings/Group.ts b/standard/typings/Group.ts
index 4bf56a9..731add0 100644
--- a/standard/typings/Group.ts
+++ b/standard/typings/Group.ts
@@ -10,4 +10,5 @@ export interface Item {
     avatar?: string;
     createdOn?: number;
     allowInvites?: boolean;
-}
\ No newline at end of file
+    announcement?: string;
+}
diff --git a/standard/typings/Message.ts b/standard/typings/Message.ts
index 95a0073..97d3e41 100644
--- a/standard/typings/Message.ts
+++ b/standard/typings/Message.ts
@@ -66,6 +66,7 @@ export interface TextBody extends Body {
     atMemberList: AtList;
     text: string;
     isSystem: boolean;
+    quoteMsg:General|undefined;
 }
 
 /**
@@ -99,6 +100,7 @@ export interface VoiceBody extends Body {
     localPath: string;
     remotePath: string;
     duration: number;
+    shouldRead?: boolean;
 }
 
 /**
@@ -128,6 +130,7 @@ export interface VideoBody extends Body {
     localPath?: string;
     remotePath?: string;
     duration: number;
+    shouldRead?: boolean;
 }
 
 /**
diff --git a/standard/typings/Props.ts b/standard/typings/Props.ts
index 3318e6b..843bf8e 100644
--- a/standard/typings/Props.ts
+++ b/standard/typings/Props.ts
@@ -1,8 +1,8 @@
-import { NavigationScreenProp, NavigationRoute } from 'react-navigation';
+import { NavigationContainerRef } from '@react-navigation/native';
 import * as Conversation from './Conversation';
 
 export interface Navigation {
-    navigation: NavigationScreenProp<NavigationRoute>;
+    navigation: NavigationContainerRef;
 }
 
 export interface Refresh {
diff --git a/standard/util/DateUtil.ts b/standard/util/DateUtil.ts
index 900403c..1dbdf87 100644
--- a/standard/util/DateUtil.ts
+++ b/standard/util/DateUtil.ts
@@ -1,6 +1,6 @@
 import * as RNLocalize from 'react-native-localize';
-import DateFormat from 'dateformat';
 import i18n from 'i18n-js';
+import {General} from "standard/typings/Message";
 
 export function showDateTime(
     timestamp: number,
@@ -12,8 +12,7 @@ export function showDateTime(
     const now = new Date();
     const that = new Date(timestamp);
     const locale = i18n.locale;
-    const options: Intl.DateTimeFormatOptions = {
-    };
+    const options: Intl.DateTimeFormatOptions = {};
     const isSameDay = sameDay(now, that);
     const isSameWeek = sameWeek(now, that);
     const timeStr = (isSameDay || showTime) ? that.toLocaleTimeString(locale, {
@@ -43,4 +42,10 @@ function isInNDay(now: Date, that: Date, number: number) {
     const today = new Date(now.getFullYear(), now.getMonth(), now.getDate()).getTime();
     const before = new Date(today - 24 * 3600 * 1000 * number).getTime();
     return that.getTime() < today && before <= that.getTime();
-}
\ No newline at end of file
+}
+
+export function needShowTime(forward: General, current: General) {
+    return !(forward &&
+        current.timestamp - forward.timestamp < 3 * 60 * 1000 &&
+        Math.floor(new Date(forward.timestamp).getMinutes() / 3) === Math.floor(new Date(current.timestamp).getMinutes() / 3))
+}
diff --git a/standard/util/imPhotoBrowser.ts b/standard/util/imPhotoBrowser.ts
new file mode 100644
index 0000000..8bbc39a
--- /dev/null
+++ b/standard/util/imPhotoBrowser.ts
@@ -0,0 +1,10 @@
+import { PhotoBrowserPage } from 'react-native-photo-browse';
+
+function initIMPhotoBrowser(defaultProps: PhotoBrowserPage.defaultProps) {
+    try {
+        PhotoBrowserPage.defaultProps = defaultProps;
+    } catch (e) {
+    }
+}
+
+export {initIMPhotoBrowser}
diff --git a/standard/util/index.ts b/standard/util/index.ts
index 29869a8..62c9a05 100644
--- a/standard/util/index.ts
+++ b/standard/util/index.ts
@@ -3,6 +3,7 @@ import deepExport from './deepExport';
 import guid from './guid';
 import mapListToSection from './mapListToSection';
 import simpleExport from './simpleExport';
+import {initIMPhotoBrowser} from './imPhotoBrowser';
 
 export {
     DateUtil,
@@ -10,4 +11,5 @@ export {
     guid,
     mapListToSection,
     simpleExport,
-};
\ No newline at end of file
+    initIMPhotoBrowser,
+};
diff --git a/tsconfig.json b/tsconfig.json
index 44b8bab..dbb7108 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,9 +3,9 @@
     /* Basic Options */
     "target": "ES2017",
     "module": "commonjs",
-    "lib": [
-      "es2015"
-    ],
+    // "lib": [
+    //   "es2015"
+    // ],
     // "allowJs": true,                       /* Allow javascript files to be compiled. */
     // "checkJs": true,                       /* Report errors in .js files. */
     "jsx": "react",
diff --git a/yarn.lock b/yarn.lock
index acf59d7..8fbe199 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -96,16 +96,6 @@
   dependencies:
     "@types/hammerjs" "^2.0.36"
 
-"@hecom-rn/react-native-full-image-picker@1.3.1":
-  version "1.3.1"
-  resolved "https://registry.npm.taobao.org/@hecom-rn/react-native-full-image-picker/download/@hecom-rn/react-native-full-image-picker-1.3.1.tgz#b22b70fde9dcfb53ebdde830b9e19ad5a14266cb"
-  integrity sha1-sitw/enc+1Pr3egwueGa1aFCZss=
-  dependencies:
-    "@react-native-community/cameraroll" "^1.2.1"
-    react-native-fs "^2.13.3"
-    react-native-pure-navigation-bar "^1.4.7"
-    react-native-root-siblings "^3.1.7"
-
 "@hecom-rn/react-native-general-actionsheet@1.0.5":
   version "1.0.5"
   resolved "https://registry.npmjs.org/@hecom-rn/react-native-general-actionsheet/-/react-native-general-actionsheet-1.0.5.tgz#2d2f8584e408fb1ed99614be9572473e0cbc4bf1"
@@ -113,16 +103,30 @@
   dependencies:
     react-native-safe-area-utility "^1.0.0"
 
-"@hecom/badge@^1.0.2":
+"@hecom/badge@^1.0.3":
   version "1.0.3"
-  resolved "https://registry.npmjs.org/@hecom/badge/-/badge-1.0.3.tgz#ea7691709a47df04e26d858f994a213406ada317"
-  integrity sha512-tOXKM+2MypDbUBXh7cZ4RefQyzzr2I46SLtu0vzFM4ewJnjw7ABw1chv0tsE9yUrPRyK+I1U2l3WQ8nzsPU2AQ==
+  resolved "https://registry.npm.taobao.org/@hecom/badge/download/@hecom/badge-1.0.3.tgz#ea7691709a47df04e26d858f994a213406ada317"
+  integrity sha1-6naRcJpH3wTibYWPmUohNAatoxc=
 
 "@hecom/image-arrow@^1.0.0", "@hecom/image-arrow@^1.0.3":
   version "1.0.3"
   resolved "https://registry.npmjs.org/@hecom/image-arrow/-/image-arrow-1.0.3.tgz#cddbd10a1c7e716a7c08d8108f8a00f804a20471"
   integrity sha512-Ao5kIffZUCFcavPjBSoz+2nrMqLHYcv7nwQqqSmgj5nEq0OsS4vpSjTHL1ernZrudnJ/Bodw13w4BjtvQgDHWA==
 
+"@hecom/listener@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/@hecom/listener/-/listener-1.0.0.tgz#31fd889e8dbf3dcb304e93213052a5d3422e60d3"
+  integrity sha512-hGsqbsecEDRDMgq/MBe2ZqmdUJIMY+NZrDACOC/CndGUoTVaS+LGHUjaidbrYN1b8dCpW2pa6DqRySiUeWHPiA==
+
+"@react-native-community/art@^1.1.2":
+  version "1.2.0"
+  resolved "https://registry.npm.taobao.org/@react-native-community/art/download/@react-native-community/art-1.2.0.tgz#386d95393f6042d9006f9d4bc6063fb898794460"
+  integrity sha1-OG2VOT9gQtkAb51LxgY/uJh5RGA=
+  dependencies:
+    art "^0.10.3"
+    invariant "^2.2.4"
+    prop-types "^15.7.2"
+
 "@react-native-community/async-storage@^1.6.1":
   version "1.7.1"
   resolved "https://registry.npmjs.org/@react-native-community/async-storage/-/async-storage-1.7.1.tgz#ef2104d865de61ad91bba66613e57e689ff4e6a1"
@@ -133,24 +137,6 @@
   resolved "https://registry.npm.taobao.org/@react-native-community/cameraroll/download/@react-native-community/cameraroll-1.4.1.tgz#e2891306243cf6a93556d4876ab99c38d497ab68"
   integrity sha1-4okTBiQ89qk1VtSHarmcONSXq2g=
 
-"@react-navigation/core@^3.5.2":
-  version "3.5.2"
-  resolved "https://registry.npmjs.org/@react-navigation/core/-/core-3.5.2.tgz#3a3d147b8419e5839e0f2ad4dea086bd2d307fe3"
-  integrity sha512-HgKXci1h74aETgm5CXMBoIWG8R7VZG1eUUHYb3BdxwekdiZjW1P/srjiXzsCqFGlsESnVIOIkzT4DqI9J752Bw==
-  dependencies:
-    hoist-non-react-statics "^3.3.0"
-    path-to-regexp "^1.7.0"
-    query-string "^6.4.2"
-    react-is "^16.8.6"
-
-"@react-navigation/native@^3.6.5":
-  version "3.6.5"
-  resolved "https://registry.npmjs.org/@react-navigation/native/-/native-3.6.5.tgz#97b0b9a48f059a0704e3527f40fb034720ef363d"
-  integrity sha512-ttEmnokFVf09CvrkzlPIdfA693KfYcRxTYf9OZwp0Ll6El27UYjJD4arwGc+zvlohjTErCdba6CAKV702Wv28w==
-  dependencies:
-    hoist-non-react-statics "^3.3.2"
-    react-native-safe-area-view "^0.14.8"
-
 "@types/eslint-visitor-keys@^1.0.0":
   version "1.0.0"
   resolved "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
@@ -194,13 +180,6 @@
     "@types/prop-types" "*"
     "@types/react" "*"
 
-"@types/react-navigation@^3.0.6":
-  version "3.4.0"
-  resolved "https://registry.npmjs.org/@types/react-navigation/-/react-navigation-3.4.0.tgz#d610d13c9162312079a8ca102660143f07432cbf"
-  integrity sha512-Y7F5zU8BTBK8tEOvUqgvwvPZ7+9vnc2UI1vHwJ/9ZJG98TntNv04GWa6lrn4MA4149pqw6cyNw/V49Yd2osAFQ==
-  dependencies:
-    react-navigation "*"
-
 "@types/react@*", "@types/react@^16.8.14":
   version "16.9.19"
   resolved "https://registry.npmjs.org/@types/react/-/react-16.9.19.tgz#c842aa83ea490007d29938146ff2e4d9e4360c40"
@@ -323,6 +302,16 @@ array.prototype.flat@^1.2.1:
     define-properties "^1.1.3"
     es-abstract "^1.17.0-next.1"
 
+art@^0.10.3:
+  version "0.10.3"
+  resolved "https://registry.npm.taobao.org/art/download/art-0.10.3.tgz#b01d84a968ccce6208df55a733838c96caeeaea2"
+  integrity sha1-sB2EqWjMzmII31WnM4OMlsrurqI=
+
+asap@~2.0.3:
+  version "2.0.6"
+  resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
+
 astral-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
@@ -905,6 +894,11 @@ chardet@^0.7.0:
   resolved "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
+charenc@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.npm.taobao.org/charenc/download/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
+  integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
+
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
@@ -946,6 +940,11 @@ convert-source-map@^1.5.1:
   dependencies:
     safe-buffer "~5.1.1"
 
+core-js@^1.0.0:
+  version "1.2.7"
+  resolved "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
+  integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
+
 core-js@^2.4.0, core-js@^2.5.0:
   version "2.6.11"
   resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
@@ -962,6 +961,11 @@ cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+crypt@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.npm.taobao.org/crypt/download/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
+  integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
+
 csstype@^2.2.0:
   version "2.6.8"
   resolved "https://registry.npmjs.org/csstype/-/csstype-2.6.8.tgz#0fb6fc2417ffd2816a418c9336da74d7f07db431"
@@ -986,11 +990,6 @@ debug@^4.0.1, debug@^4.1.0:
   dependencies:
     ms "^2.1.1"
 
-decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
-
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
@@ -1042,6 +1041,13 @@ emoji-regex@^7.0.1:
   resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
   integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
 
+encoding@^0.1.11:
+  version "0.1.12"
+  resolved "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
+  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
+  dependencies:
+    iconv-lite "~0.4.13"
+
 error-ex@^1.2.0:
   version "1.3.2"
   resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
@@ -1309,6 +1315,19 @@ fast-levenshtein@~2.0.6:
   resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
+fbjs@^0.8.9:
+  version "0.8.17"
+  resolved "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
+  integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=
+  dependencies:
+    core-js "^1.0.0"
+    isomorphic-fetch "^2.1.1"
+    loose-envify "^1.0.0"
+    object-assign "^4.1.0"
+    promise "^7.1.1"
+    setimmediate "^1.0.5"
+    ua-parser-js "^0.7.18"
+
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
@@ -1428,13 +1447,6 @@ hoist-non-react-statics@^2.3.1:
   resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
   integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
 
-hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
-  integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
-  dependencies:
-    react-is "^16.7.0"
-
 home-or-tmp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
@@ -1453,7 +1465,7 @@ i18n-js@^3.2.1:
   resolved "https://registry.npmjs.org/i18n-js/-/i18n-js-3.5.1.tgz#9787450894059bec1af791123231e59898eb97c1"
   integrity sha512-nJgbE5Vj9qzOQfjdVd/uoMoO8ppVaB/3LB6KOmMfD8IQ1vNNh307iHyQLK8ZnLYWkAszfPvVpYmUt1Le/RuHMQ==
 
-iconv-lite@^0.4.24:
+iconv-lite@^0.4.24, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -1531,6 +1543,11 @@ is-arrayish@^0.2.1:
   resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
+is-buffer@~1.1.6:
+  version "1.1.6"
+  resolved "https://registry.npm.taobao.org/is-buffer/download/is-buffer-1.1.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-buffer%2Fdownload%2Fis-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha1-76ouqdqg16suoTqXsritUf776L4=
+
 is-callable@^1.1.4, is-callable@^1.1.5:
   version "1.1.5"
   resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
@@ -1565,6 +1582,11 @@ is-regex@^1.0.5:
   dependencies:
     has "^1.0.3"
 
+is-stream@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
 is-string@^1.0.5:
   version "1.0.5"
   resolved "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
@@ -1577,11 +1599,6 @@ is-symbol@^1.0.2:
   dependencies:
     has-symbols "^1.0.1"
 
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-
 isarray@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -1592,6 +1609,14 @@ isexe@^2.0.0:
   resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
+isomorphic-fetch@^2.1.1:
+  version "2.2.1"
+  resolved "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
+  integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=
+  dependencies:
+    node-fetch "^1.0.1"
+    whatwg-fetch ">=0.10.0"
+
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -1676,6 +1701,11 @@ locate-path@^2.0.0:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
+lodash.debounce@4.0.8:
+  version "4.0.8"
+  resolved "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
+
 lodash.unescape@4.0.1:
   version "4.0.1"
   resolved "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
@@ -1693,6 +1723,15 @@ loose-envify@^1.0.0, loose-envify@^1.4.0:
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
+md5@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.npm.taobao.org/md5/download/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
+  integrity sha1-w9qaaq46MLRreww0m4exENw72k8=
+  dependencies:
+    charenc "0.0.2"
+    crypt "0.0.2"
+    is-buffer "~1.1.6"
+
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
@@ -1754,6 +1793,14 @@ nice-try@^1.0.4:
   resolved "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
+node-fetch@^1.0.1:
+  version "1.7.3"
+  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
+  integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==
+  dependencies:
+    encoding "^0.1.11"
+    is-stream "^1.0.1"
+
 normalize-package-data@^2.3.2:
   version "2.5.0"
   resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -1769,7 +1816,7 @@ number-is-nan@^1.0.0:
   resolved "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-object-assign@^4.0.1, object-assign@^4.1.1:
+object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -1918,13 +1965,6 @@ path-parse@^1.0.6:
   resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
-path-to-regexp@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
-  integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
-  dependencies:
-    isarray "0.0.1"
-
 path-type@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
@@ -1964,6 +2004,20 @@ progress@^2.0.0:
   resolved "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
+promise@^7.1.1:
+  version "7.3.1"
+  resolved "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
+  dependencies:
+    asap "~2.0.3"
+
+prop-types@15.5.8:
+  version "15.5.8"
+  resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.5.8.tgz#6b7b2e141083be38c8595aa51fc55775c7199394"
+  integrity sha1-a3suFBCDvjjIWVqlH8VXdccZk5Q=
+  dependencies:
+    fbjs "^0.8.9"
+
 prop-types@^15.5.10, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
@@ -1978,21 +2032,12 @@ punycode@^2.1.0:
   resolved "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-query-string@^6.4.2:
-  version "6.10.1"
-  resolved "https://registry.npmjs.org/query-string/-/query-string-6.10.1.tgz#30b3505f6fca741d5ae541964d1b3ae9dc2a0de8"
-  integrity sha512-SHTUV6gDlgMXg/AQUuLpTiBtW/etZ9JT6k6RCtCyqADquApLX0Aq5oK/s5UeTUAWBG50IExjIr587GqfXRfM4A==
-  dependencies:
-    decode-uri-component "^0.2.0"
-    split-on-first "^1.0.0"
-    strict-uri-encode "^2.0.0"
-
 react-deep-force-update@^1.0.0:
   version "1.1.2"
   resolved "https://registry.npmjs.org/react-deep-force-update/-/react-deep-force-update-1.1.2.tgz#3d2ae45c2c9040cbb1772be52f8ea1ade6ca2ee1"
   integrity sha512-WUSQJ4P/wWcusaH+zZmbECOk7H5N2pOIl0vzheeornkIMhu+qrNdGFm0bDZLCb0hSF0jf/kH1SgkNGfBdTc4wA==
 
-react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6:
+react-is@^16.8.1:
   version "16.12.0"
   resolved "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
   integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==
@@ -2005,20 +2050,15 @@ react-native-fs@^2.13.3:
     base-64 "^0.1.0"
     utf8 "^3.0.0"
 
-react-native-general-listener@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/react-native-general-listener/-/react-native-general-listener-1.0.3.tgz#72525b8e77fcc121b10d349984bd24433788efb9"
-  integrity sha512-MGtiKU8pBnJd3ybqkhQM9K+smaQieOHRS8GDQLmxO2pj0vxFNFDUHFOl/IIajczjPF0vNN2+4bJSmu0YAuPzLw==
-
 react-native-general-searchbar@^1.0.6:
   version "1.0.6"
   resolved "https://registry.npmjs.org/react-native-general-searchbar/-/react-native-general-searchbar-1.0.6.tgz#e17f445e57f4402577f54ac0625800e167a5a9da"
   integrity sha512-JPQWtEN5tIJR7QhDgGzI0l78E1AhwR5pdKVeeNWplhlNUGmy5Rwt1/J4F5rR5yAembUA72E2MNaR8TiUGfSXXQ==
 
-react-native-general-storage@^1.0.4:
+react-native-general-storage@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/react-native-general-storage/-/react-native-general-storage-1.0.5.tgz#0d80209fadd2446adb938f4e5d95ae76bd9125de"
-  integrity sha512-5QoffXVGeIEwWoYrOLvtHo9Ux6shHnMcJr6fkWx6Cjn87m6GxI82Q6QhWcAuRiQqaAvdXpBhcYST6Gik5MND2w==
+  resolved "https://registry.npm.taobao.org/react-native-general-storage/download/react-native-general-storage-1.0.5.tgz#0d80209fadd2446adb938f4e5d95ae76bd9125de"
+  integrity sha1-DYAgn63SRGrbk49OXZWudr2RJd4=
   dependencies:
     "@react-native-community/async-storage" "^1.6.1"
 
@@ -2038,14 +2078,14 @@ react-native-im-easemob@^1.0.24:
   integrity sha512-rutFF0NtO4kDZ1lgyvSiQhvf8UYO24utC99MfW3APPsA13RD3Sj9vZwQUtgOo84g6QHUyFJdM/ugOJc8N6ol2w==
 
 react-native-image-pan-zoom@^2.1.9:
-  version "2.1.11"
-  resolved "https://registry.npmjs.org/react-native-image-pan-zoom/-/react-native-image-pan-zoom-2.1.11.tgz#61bcb69219d95e76a9797d23e4a2e8e0bd654ae9"
-  integrity sha512-ZCisGUFpPchHXsjT7ZI0anlSLPgcTmjRKXqpVnPu3RDWFXfKjuL4zpY57DX4Y8YgGZCpbf9fApN7KjVYody2Mw==
+  version "2.1.12"
+  resolved "https://registry.npm.taobao.org/react-native-image-pan-zoom/download/react-native-image-pan-zoom-2.1.12.tgz#eb98bf56fb5610379bdbfdb63219cc1baca98fd2"
+  integrity sha1-65i/VvtWEDeb2/22MhnMG6ypj9I=
 
 react-native-image-zoom-viewer@^2.2.23:
   version "2.2.27"
-  resolved "https://registry.npmjs.org/react-native-image-zoom-viewer/-/react-native-image-zoom-viewer-2.2.27.tgz#fb3314c5dc86ac33da48cb31bf4920d97eecb6eb"
-  integrity sha512-BMA8ZGe6dub9mPbGhFn14eAnq8H5ig32nY9vPqTjsJluLTcwjkMjupu47dha1ikK7vFo0zpGDFKlv2WHbtf+EQ==
+  resolved "https://registry.npm.taobao.org/react-native-image-zoom-viewer/download/react-native-image-zoom-viewer-2.2.27.tgz#fb3314c5dc86ac33da48cb31bf4920d97eecb6eb"
+  integrity sha1-+zMUxdyGrDPaSMsxv0kg2X7stus=
   dependencies:
     react-native-image-pan-zoom "^2.1.9"
 
@@ -2067,14 +2107,29 @@ react-native-localize@^1.1.2:
   resolved "https://registry.npmjs.org/react-native-localize/-/react-native-localize-1.3.3.tgz#3e29520b4c7907227729326dfbf2f2643a07495a"
   integrity sha512-lpKx/iqDKQ7dC58fb/vGGERLT4ZYfk+H2AXMg6aaVkgv8eEIgApQAzB2Oaotx7FIM/RopJponUFyJ4PMIHi4Rw==
 
-react-native-photo-browse@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/react-native-photo-browse/-/react-native-photo-browse-1.1.1.tgz#a5a865ff3df32d0b669a92d82dd7915ff198049c"
-  integrity sha512-Ydx0T6s93D+rv/U7DSyDpNPvKPm0oCEuh4TJNv7FODvjJ3ZjdMfoK8fnJjqq2O33L2H2AXVFY4zLMk/8AIAp6Q==
+react-native-modals@^0.19.9:
+  version "0.19.10"
+  resolved "https://registry.npm.taobao.org/react-native-modals/download/react-native-modals-0.19.10.tgz#1d46020ecd1ad55e33d18b5953492ab98de2871c"
+  integrity sha1-HUYCDs0a1V4z0YtZU0kquY3ihxw=
+  dependencies:
+    babel-plugin-flow-react-proptypes "^9.1.1"
+    prop-types "^15.6.0"
+    react-native-root-siblings "^3.2.2"
+
+react-native-permissions@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.npm.taobao.org/react-native-permissions/download/react-native-permissions-2.2.2.tgz#3d2a63f6b7d6be52fc86e30f77412a9566283028"
+  integrity sha1-PSpj9rfWvlL8huMPd0EqlWYoMCg=
+
+react-native-photo-browse@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.npm.taobao.org/react-native-photo-browse/download/react-native-photo-browse-1.3.0.tgz#9d09920b324cbb16ceedcd8e1ff562d5317400fe"
+  integrity sha1-nQmSCzJMuxbO7c2OH/Vi1TF0AP4=
   dependencies:
+    "@react-native-community/cameraroll" "^1.2.1"
     react-native-fs "^2.13.3"
     react-native-image-zoom-viewer "^2.2.23"
-    react-native-progress "^3.5.0"
+    react-native-progress "^4.1.0"
     react-native-root-siblings "^3.1.6"
     react-native-root-toast "^3.0.1"
 
@@ -2093,38 +2148,25 @@ react-native-platform-touchable@^1.1.1:
   resolved "https://registry.npmjs.org/react-native-platform-touchable/-/react-native-platform-touchable-1.1.1.tgz#fde4acc65eea585d28b164d0c3716a42129a68e4"
   integrity sha1-/eSsxl7qWF0osWTQw3FqQhKaaOQ=
 
-react-native-popover-view@^1.0.17:
-  version "1.0.19"
-  resolved "https://registry.npmjs.org/react-native-popover-view/-/react-native-popover-view-1.0.19.tgz#7b3f430c4c24a96d58e08dcdf90be30e2f92836c"
-  integrity sha512-vyh96EcffKEl6S+NCG30TjMkFRohrOPdvA3tZg2/NdKb4AO6pmjCAlsq1Gntw7fUqhEDlKHAdpQmR216kDpC7Q==
-  dependencies:
-    react-native-safe-area-view "^0.10.0"
-
-react-native-popup-dialog@^0.16.6:
-  version "0.16.6"
-  resolved "https://registry.npmjs.org/react-native-popup-dialog/-/react-native-popup-dialog-0.16.6.tgz#7cbc40412191e06f8338877ca677bdde127ebd6c"
-  integrity sha512-GBwl57QQxpKZA6bdy04/KWUjDgixz0nP1HsLFpWTlYWXBORE0svcbbVGRvKRFV3W0c0zRvssV/TitwJmr9E6pQ==
+react-native-popover-view@^3.0.3:
+  version "3.1.1"
+  resolved "https://registry.npm.taobao.org/react-native-popover-view/download/react-native-popover-view-3.1.1.tgz#d55e6856ec81b2823342fda57e28974947bc8d39"
+  integrity sha1-1V5oVuyBsoIzQv2lfiiXSUe8jTk=
   dependencies:
-    babel-plugin-flow-react-proptypes "^9.1.1"
-    prop-types "^15.6.0"
-    react-native-root-siblings "^3.1.7"
+    react-native-safe-area-view "0.14.9"
 
-react-native-progress@^3.5.0:
-  version "3.6.0"
-  resolved "https://registry.npmjs.org/react-native-progress/-/react-native-progress-3.6.0.tgz#feaf37491f91bb421207fd761e20cb7258a2a3a6"
-  integrity sha512-zzTe595xaaskyfR5OzaGrU4O0R+YkgdEw+EspgGD7wh8Hu0fs6ue3xLW+HEbTjOCn62pCRivwi3NxbpWNBCC7Q==
+react-native-progress@^4.1.0:
+  version "4.1.2"
+  resolved "https://registry.npm.taobao.org/react-native-progress/download/react-native-progress-4.1.2.tgz#ffb2264ddfeba409c730e36a9791bb7bbe07a00d"
+  integrity sha1-/7ImTd/rpAnHMONql5G7e74HoA0=
   dependencies:
+    "@react-native-community/art" "^1.1.2"
     prop-types "^15.7.2"
 
-react-native-pure-navigation-bar@^1.4.7, react-native-pure-navigation-bar@^1.4.9:
-  version "1.4.9"
-  resolved "https://registry.npmjs.org/react-native-pure-navigation-bar/-/react-native-pure-navigation-bar-1.4.9.tgz#990d4da090300b57bf643f5e702c5181b62e7ffd"
-  integrity sha512-tDktla7L5aaq3T1AcnCGzwYb68o2QtCvaOHBdN0hOy+LI1nrvSp2IBofylHegJTkUYBh64mbyfgmJp/VSbGGww==
-
-react-native-root-siblings@^3.1.6, react-native-root-siblings@^3.1.7:
+react-native-root-siblings@^3.1.6, react-native-root-siblings@^3.2.2:
   version "3.2.3"
-  resolved "https://registry.npmjs.org/react-native-root-siblings/-/react-native-root-siblings-3.2.3.tgz#df5a1cff3a3a1f433f57320e1cae719f1b15a3f2"
-  integrity sha512-wOCCtKJteaSIW3K++hzhkfdWRikTqjrG34DnhNDVSzKatuNQyFY1fPBD1YFT/3+kxOIUmNsJdiaPMao9QgoZMA==
+  resolved "https://registry.npm.taobao.org/react-native-root-siblings/download/react-native-root-siblings-3.2.3.tgz#df5a1cff3a3a1f433f57320e1cae719f1b15a3f2"
+  integrity sha1-31oc/zo6H0M/VzIOHK5xnxsVo/I=
   dependencies:
     prop-types "^15.6.2"
     static-container "^1.0.0"
@@ -2136,10 +2178,10 @@ react-native-root-siblings@^4.0.0:
   dependencies:
     static-container "^1.5.1"
 
-react-native-root-toast@^3.0.1, react-native-root-toast@^3.1.1:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/react-native-root-toast/-/react-native-root-toast-3.2.0.tgz#eecd50bb914ad74152c0049d77f8e7c9842e03fa"
-  integrity sha512-Y8udA38bGvqdFRp9JiIAAxCaTc1TnjVWjG15UWzOzTKU4+kVuuCCuSGS1PZswhj+eA0ZuB2y2UbZ/ylxOknJ+Q==
+react-native-root-toast@^3.0.1, react-native-root-toast@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.npm.taobao.org/react-native-root-toast/download/react-native-root-toast-3.2.1.tgz#f456d029f5c5b76e4b686334f25371465478a3be"
+  integrity sha1-9FbQKfXFt25LaGM08lNxRlR4o74=
   dependencies:
     prop-types "^15.5.10"
     react-native-root-siblings "^4.0.0"
@@ -2149,17 +2191,10 @@ react-native-safe-area-utility@^1.0.0:
   resolved "https://registry.npmjs.org/react-native-safe-area-utility/-/react-native-safe-area-utility-1.0.0.tgz#1dc289145f67d65ff70cb57b3aa8898e2d588438"
   integrity sha512-tavIx5ONlc+VqthQnjgNUE2WqfZJ/kf2kXyWq7y/wRxz5Ag0wG8eInQnRYkKA1cM7LncPx+9agBmy54IOXY2dw==
 
-react-native-safe-area-view@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.npmjs.org/react-native-safe-area-view/-/react-native-safe-area-view-0.10.0.tgz#e8e9228d22698c0f82ad1202d24a4e4977260489"
-  integrity sha512-Y70uGBxfB5E+ipf4QInBynSQbuWdCtC1roJqrW9HGwYCTMLy6+ZxyOxMTe07N9jXlPX+FKzxeoEK9k8U2Zi4Sw==
-  dependencies:
-    hoist-non-react-statics "^2.3.1"
-
-react-native-safe-area-view@^0.14.8:
-  version "0.14.8"
-  resolved "https://registry.npmjs.org/react-native-safe-area-view/-/react-native-safe-area-view-0.14.8.tgz#ef33c46ff8164ae77acad48c3039ec9c34873e5b"
-  integrity sha512-MtRSIcZNstxv87Jet+UsPhEd1tpGe8cVskDXlP657x6rHpSrbrc+y13ZNXrwAgGNNhqQNX7UJT68ZIq//ZRmvw==
+react-native-safe-area-view@0.14.9:
+  version "0.14.9"
+  resolved "https://registry.npm.taobao.org/react-native-safe-area-view/download/react-native-safe-area-view-0.14.9.tgz#90ee8383037010d9a5055a97cf97e4c1da1f0c3d"
+  integrity sha1-kO6DgwNwENmlBVqXz5fkwdofDD0=
   dependencies:
     hoist-non-react-statics "^2.3.1"
 
@@ -2190,14 +2225,6 @@ react-navigation-header-buttons@^2.1.1:
   dependencies:
     react-native-platform-touchable "^1.1.1"
 
-react-navigation@*:
-  version "4.1.1"
-  resolved "https://registry.npmjs.org/react-navigation/-/react-navigation-4.1.1.tgz#670a1712e945e454fe9cafa424e685c2f1f30832"
-  integrity sha512-HEzPOsndrKnxTf0+gsi1N/0GKbwu8KSTOveL7ptJLG7XNXHBXVvp4lbaS3PVPe2IaiXbXCC+y3VJ8dH50wHR4g==
-  dependencies:
-    "@react-navigation/core" "^3.5.2"
-    "@react-navigation/native" "^3.6.5"
-
 react-proxy@^1.1.7:
   version "1.1.8"
   resolved "https://registry.npmjs.org/react-proxy/-/react-proxy-1.1.8.tgz#9dbfd9d927528c3aa9f444e4558c37830ab8c26a"
@@ -2231,6 +2258,15 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
+recyclerlistview@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/recyclerlistview/-/recyclerlistview-3.0.0.tgz#72ef5ef0246cb851695698c37836001651e70b4f"
+  integrity sha512-t9AiPgwGkCwhCXJhrRj7UhEJ0kpiOkc4g89txurZs2crACg8zVStRRYk6tehECz2NQvmM9Gmp+apGBqie33++Q==
+  dependencies:
+    lodash.debounce "4.0.8"
+    prop-types "15.5.8"
+    ts-object-utils "0.0.5"
+
 regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
@@ -2326,6 +2362,11 @@ semver@5.5.0:
   resolved "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
   integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
 
+setimmediate@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
+
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -2403,16 +2444,6 @@ spdx-license-ids@^3.0.0:
   resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
   integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
 
-specials@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.npmjs.org/specials/-/specials-2.0.4.tgz#7bf645511091ac739ffb2dbea45972246b20327b"
-  integrity sha512-OmU27wK7SUxAXJrVC29U8XjiGBmD/0oxemhzdgwRtPT3LwTo66GIUXqMZqYuyBp8/aiLqTTfaRLvECqdV48uRA==
-
-split-on-first@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"
-  integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==
-
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -2423,11 +2454,6 @@ static-container@^1.0.0, static-container@^1.5.1:
   resolved "https://registry.npmjs.org/static-container/-/static-container-1.5.1.tgz#9d7a94e04dea864539a7b6a1304843ada740dc19"
   integrity sha512-OFChfLKIvSzaMA3otS5CEabJTIzHFPhMxogIT+io4F207PXTvS6woFyjXIyXyqMIYAhryePGeFZYC6uLcG1lpA==
 
-strict-uri-encode@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
-  integrity sha1-ucczDHBChi9rFC3CdLvMWGbONUY=
-
 string-width@^2.1.0:
   version "2.1.1"
   resolved "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
@@ -2558,6 +2584,11 @@ trim-right@^1.0.1:
   resolved "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
   integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 
+ts-object-utils@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.npmjs.org/ts-object-utils/-/ts-object-utils-0.0.5.tgz#95361cdecd7e52167cfc5e634c76345e90a26077"
+  integrity sha1-lTYc3s1+UhZ8/F5jTHY0XpCiYHc=
+
 tsconfig-paths@^3.6.0:
   version "3.9.0"
   resolved "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
@@ -2592,6 +2623,11 @@ typescript@^3.3.3333:
   resolved "https://registry.npmjs.org/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
   integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==
 
+ua-parser-js@^0.7.18:
+  version "0.7.21"
+  resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777"
+  integrity sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==
+
 uri-js@^4.2.2:
   version "4.2.2"
   resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
@@ -2612,6 +2648,11 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
+whatwg-fetch@>=0.10.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
+  integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==
+
 which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"