xjw/circle_app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2.5.9代码提交

Browse Source
This commit is contained in:
CYH 2025-04-18 11:33:12 +08:00
parent 74176e320b
commit 158a936bcb
8 changed files with 247 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
circle_app/android/app/build.gradle
View File

@ -71,8 +71,8 @@ android {
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdkVersion 21 minSdkVersion 21
targetSdkVersion flutter.targetSdkVersion targetSdkVersion flutter.targetSdkVersion
versionCode 108 versionCode 109
versionName "2.5.8" versionName "2.5.9"
manifestPlaceholders = [ manifestPlaceholders = [
vivo_APPID: "105669716", vivo_APPID: "105669716",
vivo_APPKEY:"84f750207787376b310ca5b0d5969122", vivo_APPKEY:"84f750207787376b310ca5b0d5969122",

18
circle_app/data/china.json
View File

@ -3898,7 +3898,7 @@
"关岭布依族苗族自治县"] "关岭布依族苗族自治县"]
}, },
{ {
"name": "铜仁地区", "name": "铜仁市",
"area": [ "area": [
"铜仁市", "铜仁市",
"德江县", "德江县",
@ -3912,7 +3912,7 @@
"万山特区"] "万山特区"]
}, },
{ {
"name": "毕节地区", "name": "毕节市",
"area": [ "area": [
"毕节市", "毕节市",
"黔西县", "黔西县",
@ -4187,7 +4187,7 @@
"墨竹工卡县"] "墨竹工卡县"]
}, },
{ {
"name": "那曲地区", "name": "那曲市",
"area": [ "area": [
"那曲县", "那曲县",
"嘉黎县", "嘉黎县",
@ -4201,7 +4201,7 @@
"尼玛县"] "尼玛县"]
}, },
{ {
"name": "昌都地区", "name": "昌都市",
"area": [ "area": [
"昌都县", "昌都县",
"江达县", "江达县",
@ -4216,7 +4216,7 @@
"边坝县"] "边坝县"]
}, },
{ {
"name": "林芝地区", "name": "林芝市",
"area": [ "area": [
"林芝县", "林芝县",
"工布江达县", "工布江达县",
@ -4227,7 +4227,7 @@
"朗县"] "朗县"]
}, },
{ {
"name": "山南地区", "name": "山南市",
"area": [ "area": [
"乃东县", "乃东县",
"扎囊县", "扎囊县",
@ -4243,7 +4243,7 @@
"浪卡子县"] "浪卡子县"]
}, },
{ {
"name": "日喀则地区", "name": "日喀则市",
"area": [ "area": [
"日喀则市", "日喀则市",
"南木林县", "南木林县",
@ -4592,7 +4592,7 @@
"大通回族土族自治县"] "大通回族土族自治县"]
}, },
{ {
"name": "海东地区", "name": "海东市",
"area": [ "area": [
"平安县", "平安县",
"乐都县", "乐都县",
@ -4734,7 +4734,7 @@
"鄯善县"] "鄯善县"]
}, },
{ {
"name": "哈密地区", "name": "哈密市",
"area": [ "area": [
"哈密市", "哈密市",
"伊吾县", "伊吾县",

1
circle_app/lib/circle_app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field.dart
View File

@ -512,6 +512,7 @@ class _InputTextFieldState extends TIMUIKitState<TIMInputTextField> {
lastText = ""; lastText = "";
String text = textEditingController.text.trim(); String text = textEditingController.text.trim();
textEditingController.text = '';
final convType = widget.conversationType; final convType = widget.conversationType;
if (text.isEmpty) { if (text.isEmpty) {

12
circle_app/lib/circle_app/circle/logic.dart
View File

@ -514,13 +514,13 @@ final ScrollController nearScrollController = ScrollController();
// 检查位置权限 // 检查位置权限
Future<void> startCheckLocationPermission() async { Future<void> startCheckLocationPermission() async {
var status = await Permission.location.status; // var status = await Permission.location.status;
if (status.isGranted) { // if (status.isGranted) {
getLocationPermission(); // getLocationPermission();
_isLocationGranted = true; // _isLocationGranted = true;
} else { // } else {
getNearByList(); getNearByList();
} // }
} }
void getLocationPermission() async { void getLocationPermission() async {

5
circle_app/lib/circle_app/login/login/view.dart
View File

@ -91,13 +91,14 @@ class LoginPage extends StatelessWidget {
width: 200.sp, width: 200.sp,
child: TextField( child: TextField(
onChanged: (msg) { onChanged: (msg) {
logic.isPhone = msg.isNotEmpty;
if (GetUtils.isPhoneNumber(msg) && if (GetUtils.isPhoneNumber(msg) &&
msg.length == 11) { msg.length == 11) {
logic.isPhone = true; logic.isPhone = true;
sendOpenSourceData('input_mobile',params: jsonEncode({'phone':logic.phoneEditingController.text})); sendOpenSourceData('input_mobile',params: jsonEncode({'phone':logic.phoneEditingController.text}));
FocusManager.instance.primaryFocus?.unfocus(); FocusManager.instance.primaryFocus?.unfocus();
} else { } else {
logic.isPhone = false;
} }
logic.update(); logic.update();
}, },
@ -188,7 +189,7 @@ class LoginPage extends StatelessWidget {
right: 0, right: 0,
child: GestureDetector( child: GestureDetector(
onTap: () { onTap: () {
if (logic.isPhone) { if (logic.phoneEditingController.text.length == 11) {
logic.starDownTimer(); logic.starDownTimer();
} else if (logic.phoneEditingController.text.isEmail) { } else if (logic.phoneEditingController.text.isEmail) {
logic.starDownTimer(); logic.starDownTimer();

5
circle_app/lib/circle_app/msg/view.dart
View File

@ -153,9 +153,12 @@ class _MsgPageState extends State<MsgPage> with AutomaticKeepAliveClientMixin {
), ),
) : Container(); ) : Container();
})), })),
if (logic.isShowTip)
Positioned( Positioned(
child: GetBuilder<MsgLogic>(builder: (logic) { child: GetBuilder<MsgLogic>(builder: (logic) {
if (!logic.isShowTip) {
return Container();
}
return Container( return Container(
width: Get.width, width: Get.width,
height: Get.height, height: Get.height,

64
circle_app/lib/utils/util.dart
View File

@ -290,15 +290,6 @@ pushLoginPage() async {
bool isShowVipDayTip = sharedPreferences.containsKey(SharedPreferencesHelper.vipDayTip); bool isShowVipDayTip = sharedPreferences.containsKey(SharedPreferencesHelper.vipDayTip);
List<String> tipList = sharedPreferences.getStringList();
sharedPreferences.clear();
sharedPreferences.setString(SharedPreferencesHelper.LOGINPHONE, loginPhone);
sharedPreferences.setString(SharedPreferencesHelper.PWD, pwd);
sharedPreferences.setBool(SharedPreferencesHelper.AGREEMENT, true);
sharedPreferences.setString(SharedPreferencesHelper.firstLogin, '1');
sharedPreferences.setString(SharedPreferencesHelper.UPDATEONE, updateone);
sharedPreferences.setString(SharedPreferencesHelper.UPDATE, update);
// static const nearOpTip = 'nearOpTip'; // static const nearOpTip = 'nearOpTip';
// //
// static const circleCallOpTip = 'circleCallOpTip'; // static const circleCallOpTip = 'circleCallOpTip';
@ -310,23 +301,48 @@ pushLoginPage() async {
// static const msgOpTip = 'msgOpTip'; // static const msgOpTip = 'msgOpTip';
// //
// static const mineOpTip = 'mineOpTip'; // static const mineOpTip = 'mineOpTip';
// sharedPreferences.clear();
bool nearOpTip = sharedPreferences.getBool(SharedPreferencesHelper.nearOpTip) ?? false; bool isShowNearOpTip = sharedPreferences.containsKey(SharedPreferencesHelper.nearOpTip);
bool circleCallOpTip = sharedPreferences.getBool(SharedPreferencesHelper.circleCallOpTip) ?? false; bool isShowcircleCallOpTip = sharedPreferences.containsKey(SharedPreferencesHelper.circleCallOpTip);
bool circleLikeOpTip = sharedPreferences.getBool(SharedPreferencesHelper.circleLikeOpTip) ?? false; bool isShowcircleLikeOpTip = sharedPreferences.containsKey(SharedPreferencesHelper.circleLikeOpTip);
bool calloutOpTip = sharedPreferences.getBool(SharedPreferencesHelper.calloutOpTip) ?? false; bool isShowcalloutOpTip = sharedPreferences.containsKey(SharedPreferencesHelper.calloutOpTip);
bool msgOpTip = sharedPreferences.getBool(SharedPreferencesHelper.msgOpTip) ?? false; bool isShowmsgOpTip = sharedPreferences.containsKey(SharedPreferencesHelper.msgOpTip);
bool mineOpTip = sharedPreferences.getBool(SharedPreferencesHelper.mineOpTip) ?? false; bool isShowmineOpTip = sharedPreferences.containsKey(SharedPreferencesHelper.mineOpTip);
bool serveTip = sharedPreferences.getBool(SharedPreferencesHelper.serveTip) ?? false; bool isShoserveTip = sharedPreferences.containsKey(SharedPreferencesHelper.serveTip);
sharedPreferences.setBool(SharedPreferencesHelper.serveTip, serveTip); List<String> tipList = sharedPreferences.getStringList();
sharedPreferences.setBool(SharedPreferencesHelper.nearOpTip, nearOpTip); sharedPreferences.clear();
sharedPreferences.setBool(SharedPreferencesHelper.circleCallOpTip, circleCallOpTip); sharedPreferences.setString(SharedPreferencesHelper.LOGINPHONE, loginPhone);
sharedPreferences.setBool(SharedPreferencesHelper.circleLikeOpTip, circleLikeOpTip); sharedPreferences.setString(SharedPreferencesHelper.PWD, pwd);
sharedPreferences.setBool(SharedPreferencesHelper.calloutOpTip, calloutOpTip); sharedPreferences.setBool(SharedPreferencesHelper.AGREEMENT, true);
sharedPreferences.setBool(SharedPreferencesHelper.msgOpTip, msgOpTip); sharedPreferences.setString(SharedPreferencesHelper.firstLogin, '1');
sharedPreferences.setBool(SharedPreferencesHelper.mineOpTip, mineOpTip); sharedPreferences.setString(SharedPreferencesHelper.UPDATEONE, updateone);
sharedPreferences.setString(SharedPreferencesHelper.UPDATE, update);
if (isShoserveTip) {
sharedPreferences.setBool(SharedPreferencesHelper.serveTip, false);
}
if (isShowNearOpTip) {
sharedPreferences.setBool(SharedPreferencesHelper.nearOpTip, false);
}
if (isShowcircleCallOpTip) {
sharedPreferences.setBool(SharedPreferencesHelper.circleCallOpTip, false);
}
if (isShowcircleLikeOpTip) {
sharedPreferences.setBool(SharedPreferencesHelper.circleLikeOpTip, false);
}
if (isShowcalloutOpTip) {
sharedPreferences.setBool(SharedPreferencesHelper.calloutOpTip, false);
}
if (isShowmsgOpTip) {
sharedPreferences.setBool(SharedPreferencesHelper.msgOpTip, false);
}
if (isShowmineOpTip) {
sharedPreferences.setBool(SharedPreferencesHelper.mineOpTip, false);
}
if (isShowVipDayTip) { if (isShowVipDayTip) {
sharedPreferences.setString(SharedPreferencesHelper.vipDayTip, '1'); sharedPreferences.setString(SharedPreferencesHelper.vipDayTip, '1');

5
circle_app/pubspec.yaml
View File

@ -91,8 +91,7 @@ dependencies:
# 微信SDK插件 # 微信SDK插件
fluwx: ^3.8.1+1 fluwx: ^3.8.1+1
event_bus: ^2.0.0 event_bus: ^2.0.0
#安装apk
flutter_install_app: 1.3.0
#闪屏页 #闪屏页
flutter_native_splash: 2.2.16 flutter_native_splash: 2.2.16
#腾讯离线推送 #腾讯离线推送
@ -115,6 +114,8 @@ dependencies:
gradient_borders: ^1.0.0 gradient_borders: ^1.0.0
#系统设置 安卓4.3.1 苹果4.0.4 #系统设置 安卓4.3.1 苹果4.0.4
app_settings: 4.3.1 app_settings: 4.3.1
#安装apk
flutter_install_app: 1.3.0
#通知权限 #通知权限
notification_permissions: ^0.6.1 notification_permissions: ^0.6.1
#分帧 #分帧