Merge branch 'master' into vip_3.1_null_safety

* master:
  直播页面弹窗切换按钮位置
  隐私开关显示错误，文案变更
  更新关于我们页面
  更新按钮位置切换
  手机号显示开关添加提示
  添加历史累计收益
  fix live room can not log out
  1.6.13-master+282
  更新商务合作页面
  店铺补贴描述文字修改
  iOS 解决wechat冲突
  upgrade fluwx version
  更新我的页面
  更换彩票图片
  修复余额页面请求失败的问题,修改错误页面
  remove drone.yml
  add import sort dev package and sort all import
  1.6.6-vip+276
  使用webp优化splash显示效果

# Conflicts:
#	android/build.gradle
#	lib/main.dart
#	lib/pages/home/home_page.dart
#	lib/pages/live/video/crop_video_page.dart
#	lib/pages/user/user_set_password_varcode.dart
#	pubspec.lock
#	pubspec.yaml

.drone.yml

@@ -1,17 +0,0 @@
-kind: pipeline
-type: docker
-name: default
-
-steps:
-- name: greeting
-  image: alpine
-  commands:
-  - echo ashegvfaywefywaegfkuawf
-  volumes:
-  - name: git
-    path: /drone/src/.git
-
-volumes:
-- name: cache
-  host:
-    path: /home/ubuntu/drone_repo/test_drone

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.4.10'
     ext.flutterFFmpegPackage = 'min-lts'
     repositories {
         google()