diff --git a/circle_app/android/app/src/main/AndroidManifest.xml b/circle_app/android/app/src/main/AndroidManifest.xml
index 66e1bb1..0c67e0f 100644
--- a/circle_app/android/app/src/main/AndroidManifest.xml
+++ b/circle_app/android/app/src/main/AndroidManifest.xml
@@ -28,7 +28,7 @@
-
- -
+
+
-
+ android:src="@mipmap/launch_back" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/circle_app/android/app/src/main/res/drawable/launch_background.xml b/circle_app/android/app/src/main/res/drawable/launch_background.xml
index 54e6e21..6ce8efd 100644
--- a/circle_app/android/app/src/main/res/drawable/launch_background.xml
+++ b/circle_app/android/app/src/main/res/drawable/launch_background.xml
@@ -1,12 +1,20 @@
- -
+
-
+ -
+
+
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 8bd5a6b..4abd825 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_foreground.png b/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
index 0d51dad..cc991b3 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 9b7a659..50cbf69 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 baac193..b810ac4 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_foreground.png b/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
index 2662530..7587442 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 9461c68..5815802 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 3fcfd44..be705e3 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_foreground.png b/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
index 0791ee2..3edaa9c 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 24eae06..095200d 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-xhdpi/launch_image.png b/circle_app/android/app/src/main/res/mipmap-xhdpi/launch_image.png
deleted file mode 100644
index 252cd3b..0000000
Binary files a/circle_app/android/app/src/main/res/mipmap-xhdpi/launch_image.png and /dev/null differ
diff --git a/circle_app/android/app/src/main/res/mipmap-xhdpi/launch_image.webp b/circle_app/android/app/src/main/res/mipmap-xhdpi/launch_image.webp
new file mode 100644
index 0000000..a2c0923
Binary files /dev/null and b/circle_app/android/app/src/main/res/mipmap-xhdpi/launch_image.webp 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 5b179e0..ace41d6 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_foreground.png b/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
index c1c5703..e378a5e 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 49f166a..aadf37c 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-xxhdpi/icon_img.png b/circle_app/android/app/src/main/res/mipmap-xxhdpi/icon_img.png
new file mode 100644
index 0000000..a1f3eaa
Binary files /dev/null and b/circle_app/android/app/src/main/res/mipmap-xxhdpi/icon_img.png differ
diff --git a/circle_app/android/app/src/main/res/mipmap-xxhdpi/launch_back.webp b/circle_app/android/app/src/main/res/mipmap-xxhdpi/launch_back.webp
new file mode 100644
index 0000000..74b9021
Binary files /dev/null and b/circle_app/android/app/src/main/res/mipmap-xxhdpi/launch_back.webp differ
diff --git a/circle_app/android/app/src/main/res/mipmap-xxhdpi/launch_image.png b/circle_app/android/app/src/main/res/mipmap-xxhdpi/launch_image.png
deleted file mode 100644
index 5b42848..0000000
Binary files a/circle_app/android/app/src/main/res/mipmap-xxhdpi/launch_image.png and /dev/null differ
diff --git a/circle_app/android/app/src/main/res/mipmap-xxhdpi/launch_image.webp b/circle_app/android/app/src/main/res/mipmap-xxhdpi/launch_image.webp
new file mode 100644
index 0000000..6f27323
Binary files /dev/null and b/circle_app/android/app/src/main/res/mipmap-xxhdpi/launch_image.webp differ
diff --git a/circle_app/android/app/src/main/res/mipmap-xxhdpi/logo.png b/circle_app/android/app/src/main/res/mipmap-xxhdpi/logo.png
new file mode 100644
index 0000000..6dd4bba
Binary files /dev/null and b/circle_app/android/app/src/main/res/mipmap-xxhdpi/logo.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 2208fde..cf3bc73 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_foreground.png b/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
index 9845e87..ac14f70 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 0d75056..e1a9376 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/mipmap-xxxhdpi/launch_image.png b/circle_app/android/app/src/main/res/mipmap-xxxhdpi/launch_image.png
deleted file mode 100644
index 14511d8..0000000
Binary files a/circle_app/android/app/src/main/res/mipmap-xxxhdpi/launch_image.png and /dev/null differ
diff --git a/circle_app/android/app/src/main/res/mipmap-xxxhdpi/launch_image.webp b/circle_app/android/app/src/main/res/mipmap-xxxhdpi/launch_image.webp
new file mode 100644
index 0000000..8f5cb08
Binary files /dev/null and b/circle_app/android/app/src/main/res/mipmap-xxxhdpi/launch_image.webp differ
diff --git a/circle_app/assets/images/base/ic_launcher.png b/circle_app/assets/images/base/ic_launcher.png
index 5b179e0..cf3bc73 100644
Binary files a/circle_app/assets/images/base/ic_launcher.png and b/circle_app/assets/images/base/ic_launcher.png differ
diff --git a/circle_app/assets/images/base/launch_image.webp b/circle_app/assets/images/base/launch_image.webp
new file mode 100644
index 0000000..5e1f520
Binary files /dev/null and b/circle_app/assets/images/base/launch_image.webp differ
diff --git a/circle_app/assets/images/login/icon_logo_name.png b/circle_app/assets/images/login/icon_logo_name.png
new file mode 100644
index 0000000..d45c005
Binary files /dev/null and b/circle_app/assets/images/login/icon_logo_name.png differ
diff --git a/circle_app/lib/app/call_out/view.dart b/circle_app/lib/app/call_out/view.dart
index b8746c1..57ce01a 100644
--- a/circle_app/lib/app/call_out/view.dart
+++ b/circle_app/lib/app/call_out/view.dart
@@ -32,7 +32,7 @@ class Call_outPage extends StatelessWidget {
resizeToAvoidBottomInset: false,
backgroundColor: Colors.transparent,
appBar: MyAppBar(
- centerTitle: '世界喊话',
+ centerTitle: '圈内喊话',
actionWdiget: Image.asset(
getCircleImage('push'),
width: 54.sp,
diff --git a/circle_app/lib/app/circle/state.dart b/circle_app/lib/app/circle/state.dart
index 52a9fce..511e096 100644
--- a/circle_app/lib/app/circle/state.dart
+++ b/circle_app/lib/app/circle/state.dart
@@ -136,7 +136,7 @@ class User {
String? nickname;
int? orientation;
int? role;
- int? vip;
+ int vip = 0;
User(
{this.avatar,
@@ -149,7 +149,7 @@ class User {
this.nickname,
this.orientation,
this.role,
- this.vip});
+ this.vip=0});
User.fromJson(Map json) {
avatar = json['avatar'];
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 f50ea33..ac7afd6 100644
--- a/circle_app/lib/app/circle/widgets/info_list_view.dart
+++ b/circle_app/lib/app/circle/widgets/info_list_view.dart
@@ -633,7 +633,7 @@ class _InfoListViewState extends State with AutomaticKeepAliveClie
SizedBox(
width: 8.sp,
),
- lists.user!.vip! == 0
+ lists.user!.vip==null|| lists.user!.vip! == 0
? Container()
: Image.asset(
getCircleImage('vip'),
@@ -661,8 +661,8 @@ class _InfoListViewState extends State with AutomaticKeepAliveClie
Color(0xffB5D3FF)
])),
child: Text(
- getAgeCOntent(lists.user!.gender!, lists.user!.age!,
- lists.user!.role!, lists.user!.orientation!),
+ getAgeCOntent(lists.user!.gender??0, lists.user!.age??0,
+ lists.user!.role??0, lists.user!.orientation??0),
// '${genderList[lists.user!.gender!]}.${lists.user!.age}.${roleList[lists.user!.role!]}.${orientationList[lists.user!.orientation!]}',
style: TextStyle(
color: Colors.black,
@@ -928,7 +928,7 @@ class _InfoListViewState extends State with AutomaticKeepAliveClie
SizedBox(
width: 8.sp,
),
- lists.user!.vip! == 0
+ lists.user!.vip==null|| lists.user!.vip! == 0
? Container()
: Image.asset(
getCircleImage('vip'),
@@ -957,8 +957,8 @@ class _InfoListViewState extends State with AutomaticKeepAliveClie
Color(0xffB5D3FF)
])),
child: Text(
- getAgeCOntent(lists.user!.gender!, lists.user!.age!,
- lists.user!.role!, lists.user!.orientation!),
+ getAgeCOntent(lists.user!.gender??0, lists.user!.age??0,
+ lists.user!.role??0, lists.user!.orientation??0),
style: TextStyle(
color: Colors.black,
fontSize: 12.sp,
diff --git a/circle_app/lib/app/home/logic.dart b/circle_app/lib/app/home/logic.dart
index 2c76ead..6affbf1 100644
--- a/circle_app/lib/app/home/logic.dart
+++ b/circle_app/lib/app/home/logic.dart
@@ -44,7 +44,7 @@ class HomeLogic extends GetxController {
var bean = BaseResponse.fromJson(
data, (data) => UpdateInfo.fromJson(data));
if(bean.isSuccess()&&bean.data.update==1){
- showReportDialog(Get.context!,bean.data.constraint==0,bean.data);
+ // showReportDialog(Get.context!,bean.data.constraint==0,bean.data);
}
diff --git a/circle_app/lib/app/login/complete_material/logic.dart b/circle_app/lib/app/login/complete_material/logic.dart
index d63b7b0..0d9d27e 100644
--- a/circle_app/lib/app/login/complete_material/logic.dart
+++ b/circle_app/lib/app/login/complete_material/logic.dart
@@ -121,6 +121,9 @@ class Complete_materialLogic extends GetxController {
if (state.textEditingController.text.isEmpty) {
showToast('请输入您的昵称');
return;
+ } else if(state.textEditingController.text.length<2){
+ showToast('昵称不能低于两个字');
+ return;
} else if(state.textEditingController.text.length>6){
showToast('昵称最多输入6个字');
return;
diff --git a/circle_app/lib/app/login/login/view.dart b/circle_app/lib/app/login/login/view.dart
index 3435d92..58b1529 100644
--- a/circle_app/lib/app/login/login/view.dart
+++ b/circle_app/lib/app/login/login/view.dart
@@ -34,6 +34,12 @@ class LoginPage extends StatelessWidget {
width: Get.width,
height: Get.height,
),
+ Positioned(
+ left: 0,
+ right: 0,
+ top: 180.sp,
+ child: Image.asset(getBaseImage("ic_launcher"),width: 120.sp,height: 120.sp,)),
+
Container(
width: Get.width,
height: Get.height,
diff --git a/circle_app/lib/app/splash/logic.dart b/circle_app/lib/app/splash/logic.dart
index 315c73c..8213920 100644
--- a/circle_app/lib/app/splash/logic.dart
+++ b/circle_app/lib/app/splash/logic.dart
@@ -15,9 +15,11 @@ class SplashLogic extends GetxController {
@override
void onInit() async{
super.onInit();
+ // await Future.delayed(Duration(seconds: 30));
if((await getAuthorization()).isEmpty){
pushLoginPage();
}else{
+
var data =
await DioManager.instance.put(url: Api.refreshToken,params:{});
var bean = BaseResponse.fromJson(data, (data) => LoginData.fromJson(data));
diff --git a/circle_app/lib/app/splash/view.dart b/circle_app/lib/app/splash/view.dart
index 1d6faf9..390a881 100644
--- a/circle_app/lib/app/splash/view.dart
+++ b/circle_app/lib/app/splash/view.dart
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import '../../util/util.dart';
@@ -14,15 +15,89 @@ class SplashPage extends StatelessWidget {
return Container(
decoration: BoxDecoration(
image: DecorationImage(
- image: AssetImage(getBaseImage("home_back")),
+ image: AssetImage('assets/images/base/launch_image.webp'),
fit: BoxFit.cover,
),
),
child: Scaffold(
backgroundColor: Colors.transparent,
- body: Container(),),
+ body: Stack(
+ // mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [
+ Positioned(
+ top: 117.sp,
+ left: 37.sp,
+ child: Row(children: [
+ Center(
+ child: Image.asset(getBaseImage("ic_launcher"),width: 100.sp,height: 100.sp,),
+ ),
+ Column(children: [
+ Center(
+ child: Image.asset(getLoginImage("icon_logo_name"),width: 203.sp,),
+ ),
+
+ Center(
+ child: Text(
+ '小众圈子的快乐家园',
+ style: TextStyle(
+ color: const Color(0xCCFFFFFF),
+ fontSize: 20.sp,
+ // shadows: [
+ // Shadow(
+ // color: Color(0xFFC92BFF),
+ // offset: Offset(0, 1.2),
+ // blurRadius: 3.0,
+ // ),
+ // ],
+ ),
+ ),
+ ),
+ ],)
+ ],)),
+
+
+ Positioned(
+ bottom: 74.sp,
+ left: 0,
+ right: 0,
+ child: Center(
+ child: Text(
+ '总有一个小众圈子适合你',
+ style: TextStyle(
+ fontSize: 24.sp,
+ color: Color(0xFF02FCFB), // Set the default text color
+ ),
+ ),
+ ),
+ ),
+
+ ],),),
);
});
+
}
+
}
+
+class GradientText extends StatelessWidget {
+ @override
+ Widget build(BuildContext context) {
+ return ShaderMask(
+ shaderCallback: (Rect bounds) {
+ return LinearGradient(
+ begin: Alignment.topCenter,
+ end: Alignment.bottomCenter,
+ colors: [Color(0xFF0AEBED), Color(0xFFE62CFF)],
+ ).createShader(bounds);
+ },
+ child: Text(
+ '总有一个小众圈子适合你',
+ style: TextStyle(
+ fontSize: 24,
+ color: Color(0xFF02FCFB), // Set the default text color
+ ),
+ ),
+ );
+ }
+}
\ No newline at end of file
diff --git a/circle_app/lib/app/userinfo/view.dart b/circle_app/lib/app/userinfo/view.dart
index e6fd327..3f7a940 100644
--- a/circle_app/lib/app/userinfo/view.dart
+++ b/circle_app/lib/app/userinfo/view.dart
@@ -17,8 +17,7 @@ class UserinfoPage extends StatefulWidget {
_MyTabbedScreenState createState() => _MyTabbedScreenState();
}
-class _MyTabbedScreenState extends State
- with SingleTickerProviderStateMixin {
+class _MyTabbedScreenState extends State with SingleTickerProviderStateMixin {
late TabController _tabController;
late PageController _pageController;
diff --git a/circle_app/lib/util/CacheUtil.dart b/circle_app/lib/util/CacheUtil.dart
index ee61c09..273bb97 100644
--- a/circle_app/lib/util/CacheUtil.dart
+++ b/circle_app/lib/util/CacheUtil.dart
@@ -13,13 +13,40 @@ class CacheUtil {
//打印每个缓存文件的路径
print(file.path);
});*/
- print('临时目录大小: ' + value.toString());
- return _renderSize(value);
+ var filePath = await getApplicationSupportDirectoryPath();
+ Directory directory = Directory(filePath); // 替换为您想要获取大小的目录路径
+ int totalSize = 0;
+
+ if (directory.existsSync()) {
+ await for (var entity in directory.list(recursive: true)) {
+ if (entity is File) {
+ totalSize += await entity.length();
+ }
+ }
+ }
+ if(totalSize<600000){
+ return _renderSize(value);
+ }
+ print('临时目录大小: ' + value.toString()+"\\\\"+totalSize.toString());
+ return _renderSize(value+totalSize);
} catch (err) {
print(err);
}
}
+ getDirectorySize(Directory directory) async {
+ int totalSize = 0;
+
+ if (directory.existsSync()) {
+ await for (var entity in directory.list(recursive: true)) {
+ if (entity is File) {
+ totalSize += await entity.length();
+ }
+ }
+ }
+
+ return totalSize;
+ }
///递归方式删除目录
static Future delDir(FileSystemEntity file) async {
try {
@@ -79,7 +106,21 @@ class CacheUtil {
final _tempDir = await getTemporaryDirectory();
double value = await _getTotalSizeOfFilesInDir(_tempDir);
print("$value");
- if (value.toInt() <= 0) {
+
+ var filePath = await getApplicationSupportDirectoryPath();
+ Directory directory = Directory(filePath); // 替换为您想要获取大小的目录路径
+ int totalSize = 0;
+
+ if (directory.existsSync()) {
+ await for (var entity in directory.list(recursive: true)) {
+ if (entity is File) {
+ totalSize += await entity.length();
+ }
+ }
+ }
+
+
+ if (value.toInt() <= 0&&totalSize<=0) {
showToast("暂无缓存");
// Get.back();
@@ -87,9 +128,23 @@ class CacheUtil {
// Get.back();
//showToast("正在清理中···");
SmartDialog.showLoading(msg: "正在清理中···");
- Future.delayed(Duration(seconds: 2), () async {
+ var filePath = await getApplicationSupportDirectoryPath();
+
+ Future.delayed(const Duration(seconds: 0), () async {
//删除缓存目录
await delDir(_tempDir);
+ // File(filePath).delete();
+
+ if (await directory.exists()) {
+ await for (var entity in directory.list(recursive: false)) {
+ if (entity is File) {
+ await entity.delete();
+ }
+ }
+ }
+
+
+
await loadCache();
SmartDialog.dismiss();
showToast("清理缓存成功");
diff --git a/circle_app/lib/util/PaymentUtils.dart b/circle_app/lib/util/PaymentUtils.dart
index 90e9a53..58e7aad 100644
--- a/circle_app/lib/util/PaymentUtils.dart
+++ b/circle_app/lib/util/PaymentUtils.dart
@@ -12,8 +12,8 @@ import 'package:fluwx/fluwx.dart' as fluwx;
//注册微信
void initWxApi() {
fluwx.registerWxApi(
- appId: "wx6c6f4c89465dac4b",
- universalLink: "dcc5bd5012a417eb585684700fbd1307",
+ appId: "wxab2387c2198f01e1",
+ universalLink: "https://www.leyuan666.com/",
);
}
@@ -46,6 +46,7 @@ Future openWxPay(PaymentData data, WxPayCallback callback) async {
showToast("微信支付成功");
callback(true, null);
} else {
+ print(event.errStr);
showToast(event.errStr ?? "微信支付失败");
callback(false, event.errStr);
}
diff --git a/circle_app/lib/util/location.dart b/circle_app/lib/util/location.dart
new file mode 100644
index 0000000..b5bc30f
--- /dev/null
+++ b/circle_app/lib/util/location.dart
@@ -0,0 +1,50 @@
+import 'dart:math';
+
+double calculateLineDistance(LatLng var0, LatLng var1) {
+ if (var0 != null && var1 != null) {
+ try {
+ double var2 = var0.longitude;
+ double var4 = var0.latitude;
+ double var6 = var1.longitude;
+ double var8 = var1.latitude;
+ var2 *= 0.01745329251994329;
+ var4 *= 0.01745329251994329;
+ var6 *= 0.01745329251994329;
+ var8 *= 0.01745329251994329;
+ double var10 = sin(var2);
+ double var12 = sin(var4);
+ double var14 = cos(var2);
+ double var16 = cos(var4);
+ double var18 = sin(var6);
+ double var20 = sin(var8);
+ double var22 = cos(var6);
+ double var24 = cos(var8);
+ List var28 = [0, 0, 0];
+ List var29 = [0, 0, 0];
+ var28[0] = var16 * var14;
+ var28[1] = var16 * var10;
+ var28[2] = var12;
+ var29[0] = var24 * var22;
+ var29[1] = var24 * var18;
+ var29[2] = var20;
+ return (asin(sqrt((var28[0] - var29[0]) * (var28[0] - var29[0]) + (var28[1] - var29[1]) * (var28[1] - var29[1]) + (var28[2] - var29[2]) * (var28[2] - var29[2])) / 2.0) * 1.27420015798544E7).toDouble();
+ } catch (e) {
+ print(e.toString());
+ return 0.0;
+ }
+ } else {
+ try {
+ throw Exception("非法坐标值");
+ } catch (e) {
+ print(e.toString());
+ return 0.0;
+ }
+ }
+}
+
+class LatLng {
+ double longitude;
+ double latitude;
+
+ LatLng(this.longitude, this.latitude);
+}
diff --git a/circle_app/lib/util/qiniu.dart b/circle_app/lib/util/qiniu.dart
index d2a55e9..8a9f520 100644
--- a/circle_app/lib/util/qiniu.dart
+++ b/circle_app/lib/util/qiniu.dart
@@ -67,7 +67,8 @@ void upDataImage(String quToken ,XFile pickedFile,String updataRoute,MyCallback
}
}
var path = await getApplicationSupportDirectoryPath();
- if(isImageJpgOrPng(pickedFile.path)){
+ //if(isImageJpgOrPng(pickedFile.path)){
+ if(false){
CompressObject compressObject = CompressObject(
imageFile:File(pickedFile.path), //image
path:path, //compress to path