diff --git a/circle_app/android/app/build.gradle b/circle_app/android/app/build.gradle
index a274f5f..dc14276 100644
--- a/circle_app/android/app/build.gradle
+++ b/circle_app/android/app/build.gradle
@@ -43,6 +43,10 @@ android {
}
signingConfigs {
+// ndk {
+// abiFilters 'armeabi-v7a','arm64-v8a'
+// ldLibs "log"
+// }
debug {
storeFile file('../leyuan.jks')
storePassword 'leyuan'
@@ -72,6 +76,10 @@ android {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig signingConfigs.debug
+ project.ext.enableFlutterNullSafety = false
+ }
+ debug{
+ project.ext.enableFlutterNullSafety = false
}
}
}
diff --git a/circle_app/android/app/src/main/ic_launcher-playstore.png b/circle_app/android/app/src/main/ic_launcher-playstore.png
index 66e9e8e..62da4e7 100644
Binary files a/circle_app/android/app/src/main/ic_launcher-playstore.png and b/circle_app/android/app/src/main/ic_launcher-playstore.png differ
diff --git a/circle_app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/circle_app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index c4a603d..036d09b 100644
--- a/circle_app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/circle_app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/circle_app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/circle_app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index c4a603d..036d09b 100644
--- a/circle_app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/circle_app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 2a7abab..6edbca4 100644
Binary files a/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
new file mode 100644
index 0000000..05c6f8d
Binary files /dev/null and b/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png differ
diff --git a/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
index 2093374..0caf2df 100644
Binary files a/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
index 50a9c1f..bbdcc18 100644
Binary files a/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 9255724..d85abdd 100644
Binary files a/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
new file mode 100644
index 0000000..e38c914
Binary files /dev/null and b/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png differ
diff --git a/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
index 2e82618..9cf1522 100644
Binary files a/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
index 227955a..88e6048 100644
Binary files a/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 020ffa0..aa25024 100644
Binary files a/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..d02adc0
Binary files /dev/null and b/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ
diff --git a/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
index 7f8abd5..23a55b2 100644
Binary files a/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
index 6b05b06..dd1ffa2 100644
Binary files a/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 7296a78..26f8201 100644
Binary files a/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..c49849b
Binary files /dev/null and b/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ
diff --git a/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
index 7904ee7..46ee5cc 100644
Binary files a/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
index 3ab10ac..6a800de 100644
Binary files a/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 238068d..5963223 100644
Binary files a/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..68ae16a
Binary files /dev/null and b/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ
diff --git a/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
index 6f0f1af..68ae16a 100644
Binary files a/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
index c6b93b8..6587c14 100644
Binary files a/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/circle_app/android/app/src/main/res/values/ic_launcher_background.xml b/circle_app/android/app/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 0000000..c5d5899
--- /dev/null
+++ b/circle_app/android/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+
+
+ #FFFFFF
+
\ No newline at end of file
diff --git a/circle_app/lib/app/aboutapp/logic.dart b/circle_app/lib/app/aboutapp/logic.dart
index b6a46d7..40cd61f 100644
--- a/circle_app/lib/app/aboutapp/logic.dart
+++ b/circle_app/lib/app/aboutapp/logic.dart
@@ -1,9 +1,7 @@
-import 'package:dio/dio.dart';
import 'package:flutter_install_app/flutter_install_app.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart';
-import '../../network/dio_manager.dart';
import '../../util/util.dart';
import 'state.dart';
import 'package:package_info_plus/package_info_plus.dart';
diff --git a/circle_app/lib/app/aboutapp/view.dart b/circle_app/lib/app/aboutapp/view.dart
index e5f778f..c563cd3 100644
--- a/circle_app/lib/app/aboutapp/view.dart
+++ b/circle_app/lib/app/aboutapp/view.dart
@@ -41,12 +41,16 @@ class AboutappPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
- Image.asset(
+ GestureDetector(onTap: (){
+ // showToast("13");
+ },
+ child:Image.asset(
getBaseImage("icon_login"), // Replace with your image path
width: 100.sp,
height: 100.sp,
fit: BoxFit.contain,
- ),
+ ) ,)
+ ,
SizedBox(height: 20.sp),
Text(
'圈子',
diff --git a/circle_app/lib/app/account/logic.dart b/circle_app/lib/app/account/logic.dart
index 4a3a068..c958aaa 100644
--- a/circle_app/lib/app/account/logic.dart
+++ b/circle_app/lib/app/account/logic.dart
@@ -1,5 +1,4 @@
import 'package:get/get.dart';
-import 'package:shared_preferences/shared_preferences.dart';
import '../../util/SharedPreferencesHelper.dart';
import 'state.dart';
diff --git a/circle_app/lib/app/account/view.dart b/circle_app/lib/app/account/view.dart
index fa802d8..f21e975 100644
--- a/circle_app/lib/app/account/view.dart
+++ b/circle_app/lib/app/account/view.dart
@@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
-import 'package:shared_preferences/shared_preferences.dart';
import '../../components/my_app_bar.dart';
import '../../router/app_routers.dart';
diff --git a/circle_app/lib/app/call_out/logic.dart b/circle_app/lib/app/call_out/logic.dart
index 566c4dc..3f42742 100644
--- a/circle_app/lib/app/call_out/logic.dart
+++ b/circle_app/lib/app/call_out/logic.dart
@@ -5,24 +5,19 @@ import 'dart:typed_data';
import 'package:circle_app/util/util.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
-import 'package:flutter_luban/flutter_luban.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart';
import 'package:image_picker/image_picker.dart';
-import 'package:qiniu_flutter_sdk/qiniu_flutter_sdk.dart';
-import 'package:shared_preferences/shared_preferences.dart';
import 'package:video_player/video_player.dart';
import 'package:video_thumbnail/video_thumbnail.dart';
import '../../common/Widgets/open_vip_tip/view.dart';
-import '../../common/errorcode.dart';
import '../../network/api.dart';
import '../../network/dio_manager.dart';
import '../../router/app_routers.dart';
import '../../util/SharedPreferencesHelper.dart';
import '../../util/qiniu.dart';
-import '../login/complete_material/logic.dart';
import '../select_circle/logic.dart';
import 'state.dart';
import '../../common/config.dart';
@@ -131,7 +126,7 @@ class Call_outLogic extends GetxController {
print(myBean.toString());
var data = await DioManager.instance.post(url: Api.SendShout, params: {
'album': myBean,
- 'content': textEditingController.text,
+ 'content': textEditingController.text.trim(),
'interest_id': numbers[0].id,
'use_queen': isCheck ? 1 : 0,
});
diff --git a/circle_app/lib/app/circle/widgets/info_list_view.dart b/circle_app/lib/app/circle/widgets/info_list_view.dart
index 8492708..8e2677e 100644
--- a/circle_app/lib/app/circle/widgets/info_list_view.dart
+++ b/circle_app/lib/app/circle/widgets/info_list_view.dart
@@ -285,8 +285,8 @@ class _InfoListViewState extends State with AutomaticKeepAliveClie
GestureDetector(
behavior:HitTestBehavior.opaque,
onTap: (){
- showToast("点个鸡毛，星哥还没做");
- Get.toNamed(AppRoutes.FriendsActivity,arguments: '3');
+ // showToast("点个鸡毛，星哥还没做");
+ // Get.toNamed(AppRoutes.FriendsActivity,arguments: '3');
},
child: Row(
children: [
@@ -314,10 +314,10 @@ class _InfoListViewState extends State with AutomaticKeepAliveClie
SizedBox(
width: 8.sp,
),
- Image.asset(
- getCircleImage('play'),
- width: 20.sp,
- )
+ // Image.asset(
+ // getCircleImage('play'),
+ // width: 20.sp,
+ // )
],
)
],
diff --git a/circle_app/lib/app/circle/widgets/list_logic.dart b/circle_app/lib/app/circle/widgets/list_logic.dart
index 66e770d..105cd9a 100644
--- a/circle_app/lib/app/circle/widgets/list_logic.dart
+++ b/circle_app/lib/app/circle/widgets/list_logic.dart
@@ -6,7 +6,6 @@ import 'package:circle_app/router/app_routers.dart';
import 'package:circle_app/util/util.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
-import 'package:shared_preferences/shared_preferences.dart';
import '../../../util/SharedPreferencesHelper.dart';
diff --git a/circle_app/lib/app/friendslist/logic.dart b/circle_app/lib/app/friendslist/logic.dart
index c241004..6831f93 100644
--- a/circle_app/lib/app/friendslist/logic.dart
+++ b/circle_app/lib/app/friendslist/logic.dart
@@ -1,4 +1,3 @@
-import 'dart:ffi';
import 'package:get/get.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
@@ -21,7 +20,11 @@ class FriendslistLogic extends GetxController {
super.onInit();
initList();
}
+ void dispose() {
+ refreshController.dispose();
+ super.dispose();
+ }
initList() async {
if (page == 1) {
lists.clear();
diff --git a/circle_app/lib/app/friendslist/view.dart b/circle_app/lib/app/friendslist/view.dart
index 9e44841..22558cc 100644
--- a/circle_app/lib/app/friendslist/view.dart
+++ b/circle_app/lib/app/friendslist/view.dart
@@ -51,11 +51,12 @@ class FriendslistPage extends StatelessWidget {
Widget ListItem(UserInfo item,int index) {
return GestureDetector(
+ behavior: HitTestBehavior.opaque,
onTap: (){
Get.toNamed(AppRoutes.UserInfoActivity, arguments: item.id.toString());
},
child: Container(
- margin: EdgeInsets.only(bottom: 21),
+ margin: const EdgeInsets.only(bottom: 21),
child: Row(
children: [
Stack(children: [
@@ -107,7 +108,7 @@ class FriendslistPage extends StatelessWidget {
),
SizedBox(height: 8.sp),
- Container(
+ SizedBox(
width: 150.sp,
child: Text(
item.signature,
@@ -117,7 +118,7 @@ class FriendslistPage extends StatelessWidget {
],
),
// Pla
- Spacer(),
+ const Spacer(),
GestureDetector(onTap: (){
logic.setLike(index);
diff --git a/circle_app/lib/app/likelist/logic.dart b/circle_app/lib/app/likelist/logic.dart
index 45a37f0..7780cec 100644
--- a/circle_app/lib/app/likelist/logic.dart
+++ b/circle_app/lib/app/likelist/logic.dart
@@ -1,4 +1,3 @@
-import 'dart:ffi';
import 'package:get/get.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
@@ -9,7 +8,11 @@ import '../../util/util.dart';
import 'state.dart';
class LikelistLogic extends GetxController {
+ void dispose() {
+ refreshController.dispose();
+ super.dispose();
+ }
final RefreshController refreshController = RefreshController();
final LikelistState state = LikelistState();
diff --git a/circle_app/lib/app/likelist/view.dart b/circle_app/lib/app/likelist/view.dart
index 73b0b66..ee7d895 100644
--- a/circle_app/lib/app/likelist/view.dart
+++ b/circle_app/lib/app/likelist/view.dart
@@ -55,12 +55,13 @@ class LikelistPage extends StatelessWidget {
Widget ListItem(UserListItem item, int index) {
return GestureDetector(
+ behavior: HitTestBehavior.opaque,
onTap: () {
Get.toNamed(AppRoutes.UserInfoActivity,
arguments: item.user.id.toString());
},
child: Container(
- margin: EdgeInsets.only(bottom: 21),
+ margin: EdgeInsets.only(bottom: 21.sp),
child: Row(
children: [
Stack(
@@ -82,10 +83,10 @@ class LikelistPage extends StatelessWidget {
),
),
Positioned(
- right: 0,
- left: 0,
- bottom: 0,
- child: item.isLike
+ right: 0.sp,
+ left: 0.sp,
+ bottom: 0.sp,
+ child: item.user.vip!=0
? Image(
image: AssetImage(getBaseImage("vip")),
width: 44.sp,
@@ -131,15 +132,15 @@ class LikelistPage extends StatelessWidget {
logic.setLike(index);
},
child: Container(
- width: 75,
- height: 28,
+ width: 75.sp,
+ height: 28.sp,
decoration: BoxDecoration(
color: Color(0xFFFF4D7C),
borderRadius: BorderRadius.circular(14),
),
child: Center(
child: Text(item.isLike ? "互相关注" : "关注",
- style: TextStyle(fontSize: 14, color: Colors.white)),
+ style: TextStyle(fontSize: 14.sp, color: Colors.white)),
),
),
),
@@ -159,7 +160,7 @@ class LikelistPage extends StatelessWidget {
children: [
Container(
decoration: BoxDecoration(
- borderRadius: BorderRadius.circular(17),
+ borderRadius: BorderRadius.circular(17.sp),
gradient: LinearGradient(
colors: [
Color.fromRGBO(141, 255, 248, 1.0),
@@ -175,7 +176,7 @@ class LikelistPage extends StatelessWidget {
ageMsg,
style: TextStyle(
color: Colors.black,
- fontSize: 10,
+ fontSize: 10.sp,
),
),
),
diff --git a/circle_app/lib/app/login/complete_material/logic.dart b/circle_app/lib/app/login/complete_material/logic.dart
index 779fc13..d63b7b0 100644
--- a/circle_app/lib/app/login/complete_material/logic.dart
+++ b/circle_app/lib/app/login/complete_material/logic.dart
@@ -9,7 +9,6 @@ import 'package:image_picker/image_picker.dart';
import '../../../common/config.dart';
import '../../../network/api.dart';
-import '../../../util/device.dart';
import '../../../util/qiniu.dart';
import '../../minefragment/logic.dart';
import '../../select_circle/logic.dart';
@@ -168,8 +167,8 @@ class Complete_materialLogic extends GetxController {
'orientation': state.orientationId, //Int 爱好
// 'lat': location.latitude,
// 'lng': location.longitude,
- 'nickname': state.textEditingController.text,
- 'signature': state.descEditingController.text,
+ 'nickname': state.textEditingController.text.trim(),
+ 'signature': state.descEditingController.text.trim(),
});
var bean = BaseResponse.fromJson(data, (data) => data);
if (bean.code == 200) {
diff --git a/circle_app/lib/app/minefragment/logic.dart b/circle_app/lib/app/minefragment/logic.dart
index 742fbcd..d4b7254 100644
--- a/circle_app/lib/app/minefragment/logic.dart
+++ b/circle_app/lib/app/minefragment/logic.dart
@@ -5,7 +5,6 @@ import '../../network/dio_manager.dart';
import '../../router/app_routers.dart';
import '../../util/SharedPreferencesHelper.dart';
import '../../util/util.dart';
-import '../userinfo/logic.dart';
import 'state.dart';
import 'package:shared_preferences/shared_preferences.dart';
diff --git a/circle_app/lib/app/myfeedbacklist/view.dart b/circle_app/lib/app/myfeedbacklist/view.dart
index f2f4f97..6d2b44e 100644
--- a/circle_app/lib/app/myfeedbacklist/view.dart
+++ b/circle_app/lib/app/myfeedbacklist/view.dart
@@ -56,9 +56,9 @@ class MyfeedbacklistPage extends StatelessWidget {
fontSize: 14.0.sp,
),),
Container(
- margin: EdgeInsets.only(bottom: 12.0,top: 12.sp),
+ margin: EdgeInsets.only(bottom: 12.0.sp,top: 12.sp),
decoration: BoxDecoration(
- borderRadius: BorderRadius.circular(8.0),
+ borderRadius: BorderRadius.circular(8.0.sp),
color: Color(0xff282733),
),
child: Column(
diff --git a/circle_app/lib/app/offaccount/view.dart b/circle_app/lib/app/offaccount/view.dart
index 0c0ca35..55fe7ec 100644
--- a/circle_app/lib/app/offaccount/view.dart
+++ b/circle_app/lib/app/offaccount/view.dart
@@ -256,8 +256,8 @@ class _OffaccountState extends State {
decoration: BoxDecoration(
color: Colors.black.withOpacity(0.6),
borderRadius: BorderRadius.only(
- topLeft: Radius.circular(20),
- topRight: Radius.circular(20),
+ topLeft: Radius.circular(20.sp),
+ topRight: Radius.circular(20.sp),
),
),
child: Column(
@@ -300,7 +300,7 @@ class _OffaccountState extends State {
child: Container(
width: Get.width,
alignment: Alignment.center,
- padding: EdgeInsets.symmetric(vertical: 16),
+ padding: EdgeInsets.symmetric(vertical: 16.sp),
child: Text(
title,
style: TextStyle(
@@ -314,9 +314,9 @@ class _OffaccountState extends State {
Widget buildDivider() {
return Container(
- height: 0.5,
- color: Color(0xff2E2E3B),
- margin: EdgeInsets.symmetric(horizontal: 16),
+ height: 0.5.sp,
+ color: const Color(0xff2E2E3B),
+ margin: EdgeInsets.symmetric(horizontal: 16.sp),
);
}
diff --git a/circle_app/lib/app/report/view.dart b/circle_app/lib/app/report/view.dart
index 36e23e2..b90cfb2 100644
--- a/circle_app/lib/app/report/view.dart
+++ b/circle_app/lib/app/report/view.dart
@@ -43,12 +43,12 @@ class ReportPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
- padding: EdgeInsets.only(left: 16, top: 16),
+ padding: EdgeInsets.only(left: 16.sp, top: 16.sp),
child: Text(
'举报类目',
style: TextStyle(
color: Colors.white,
- fontSize: 16,
+ fontSize: 16.sp,
),
),
),
@@ -65,10 +65,10 @@ class ReportPage extends StatelessWidget {
'详细截图（请至少上传一张图片，帮助审核处理）',
style: TextStyle(
color: Colors.white70,
- fontSize: 16,
+ fontSize: 16.sp,
),
),
- SizedBox(height: 20),
+ SizedBox(height: 20.sp),
// 添加 RecyclerView（ListView） 的内容
// 例如: MyRecyclerViewWidget(),
Container(
@@ -78,13 +78,13 @@ class ReportPage extends StatelessWidget {
'补充说明',
style: TextStyle(
color: Colors.white,
- fontSize: 14,
+ fontSize: 14.sp,
),
),
SizedBox(height: 30),
Container(
// margin: EdgeInsets.only(left: 10, right: 10),
- height: 200,
+ height: 200.sp,
width: double.infinity,
decoration: BoxDecoration(
color: Color(0xFF4C3E5F),
diff --git a/circle_app/lib/app/splash/logic.dart b/circle_app/lib/app/splash/logic.dart
index eece74e..315c73c 100644
--- a/circle_app/lib/app/splash/logic.dart
+++ b/circle_app/lib/app/splash/logic.dart
@@ -3,7 +3,6 @@ import 'package:get/get.dart';
import '../../router/app_routers.dart';
import '../../util/SharedPreferencesHelper.dart';
import 'state.dart';
-import 'package:shared_preferences/shared_preferences.dart';
import '../../network/api.dart';
import '../../network/dio_manager.dart';
diff --git a/circle_app/lib/app/visitorlist/logic.dart b/circle_app/lib/app/visitorlist/logic.dart
index 92d8f6a..3c09ce8 100644
--- a/circle_app/lib/app/visitorlist/logic.dart
+++ b/circle_app/lib/app/visitorlist/logic.dart
@@ -9,6 +9,12 @@ import '../../util/util.dart';
import 'state.dart';
class VisitorlistLogic extends GetxController {
+ @override
+ void dispose() {
+ refreshController.dispose();
+ super.dispose();
+
+ }
final RefreshController refreshController = RefreshController();
final VisitorlistState state = VisitorlistState();
diff --git a/circle_app/lib/app/visitorlist/view.dart b/circle_app/lib/app/visitorlist/view.dart
index 72c663b..ebc39d6 100644
--- a/circle_app/lib/app/visitorlist/view.dart
+++ b/circle_app/lib/app/visitorlist/view.dart
@@ -52,6 +52,7 @@ class VisitorlistPage extends StatelessWidget {
Widget ListItem(UserListItem item,int index) {
return GestureDetector(
+ behavior: HitTestBehavior.opaque,
onTap: (){
Get.toNamed(AppRoutes.UserInfoActivity, arguments: item.user.id.toString());
},
@@ -79,9 +80,9 @@ class VisitorlistPage extends StatelessWidget {
),
),
Positioned(
- right: 0,
- left: 0,
- bottom: 0,
+ right: 0.sp,
+ left: 0.sp,
+ bottom: 0.sp,
child: item.user.vip!=0 ?
Image(
@@ -125,8 +126,8 @@ class VisitorlistPage extends StatelessWidget {
},
child: Container(
- width: 60,
- height: 28,
+ width: 60.sp,
+ height: 28.sp,
decoration: BoxDecoration(
color: Color(0xFFFF4D7C),
borderRadius: BorderRadius.circular(14),
@@ -151,7 +152,7 @@ class VisitorlistPage extends StatelessWidget {
children: [
Container(
decoration: BoxDecoration(
- borderRadius: BorderRadius.circular(17),
+ borderRadius: BorderRadius.circular(17.sp),
gradient: LinearGradient(
colors: [
Color.fromRGBO(141, 255, 248, 1.0),
@@ -167,7 +168,7 @@ class VisitorlistPage extends StatelessWidget {
ageMsg ,
style: TextStyle(
color: Colors.black,
- fontSize: 10,
+ fontSize: 10.sp,
),
),
),
diff --git a/circle_app/lib/util/util.dart b/circle_app/lib/util/util.dart
index 0611481..a465e35 100644
--- a/circle_app/lib/util/util.dart
+++ b/circle_app/lib/util/util.dart
@@ -9,8 +9,6 @@ import 'package:fluttertoast/fluttertoast.dart';
import 'package:get/get.dart';
import 'package:path_provider/path_provider.dart';
-import 'package:get/get_state_manager/get_state_manager.dart';
-import 'package:shared_preferences/shared_preferences.dart';
import 'package:video_compress/video_compress.dart';
import 'SharedPreferencesHelper.dart';