Browse Source

safety

master
fmk 3 years ago
parent
commit
1f1db4acf1
  1. 19
      lib/home/activity_list_page.dart
  2. 4
      lib/login/login_page.dart
  3. 27
      lib/main_page.dart
  4. 6
      lib/retrofit/retrofit_api.dart
  5. 1
      lib/view_widget/store_title_tab.dart

19
lib/home/activity_list_page.dart

@ -70,25 +70,20 @@ class _ActivityListPage extends State<ActivityListPage>
Widget build(BuildContext context) {
super.build(context);
return Container(
child: SizeCacheWidget(
child: FutureBuilder(
future: queryActivity(),
builder: (context, snapshot) {
return SizeCacheWidget(
child: SmartRefresher(
controller: _refreshController,
enablePullDown: true,
enablePullUp: false,
header: MyHeader(),
physics: BouncingScrollPhysics(),
footer: CustomFooter(
builder: (context, mode) {
return MyFooter(mode);
},
),
onRefresh: () {
setState(() {});
},
child: FutureBuilder(
future: queryActivity(),
builder: (context, snapshot) {
return ListView.builder(
child: ListView.builder(
itemCount: activityList == null ? 0 : activityList.length,
physics: NeverScrollableScrollPhysics(),
itemBuilder: (context, position) {
@ -121,10 +116,10 @@ class _ActivityListPage extends State<ActivityListPage>
),
);
},
),
),
);
},
)
),
),
);
}

4
lib/login/login_page.dart

@ -286,10 +286,6 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
saveUserJson(value.data);
eventBus.fire(EventType(3));
xgFlutterPlugin.setAccount(mobile, AccountType.CUSTOM);
xgFlutterPlugin.bindWithIdentifier(
identify: mobile, bindType: XGBindType.account);
Navigator.of(context)
.pushNamedAndRemoveUntil('/router/main_page', (route) => false);
} else {

27
lib/main_page.dart

@ -9,6 +9,7 @@ import 'package:huixiang/home/main_home_page.dart';
import 'package:huixiang/main.dart';
import 'package:huixiang/mine/mine_page.dart';
import 'package:huixiang/retrofit/data/base_data.dart';
import 'package:huixiang/retrofit/data/user_info.dart';
import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/union/union_page.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
@ -17,6 +18,7 @@ import 'package:huixiang/utils/event_type.dart';
import 'package:huixiang/utils/native_event_handler.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:tpns_flutter_plugin/tpns_flutter_plugin.dart';
class MainPage extends StatefulWidget {
@override
@ -58,7 +60,6 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
super.initState();
WidgetsBinding.instance.addObserver(this);
EasyLoading.instance
..indicatorType = EasyLoadingIndicatorType.circle
// ..indicatorType = EasyLoadingIndicatorType.wave
@ -71,7 +72,6 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
..userInteractions = false
..dismissOnTap = false;
pushRoute();
_widgetOptions = <Widget>[
@ -122,12 +122,15 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
: (event["xg"]["msgtype"] == 1) &&
event[Platform.isAndroid ? "customMessage" : "custom"] != null) {
SharedPreferences.getInstance().then((value) {
value.setString("pushData", event[Platform.isAndroid ? "customMessage" : "custom"]);
value.setString("pushData",
event[Platform.isAndroid ? "customMessage" : "custom"]);
});
if (ModalRoute.of(context).isActive && ModalRoute.of(context).isCurrent) {
if (ModalRoute.of(context).isActive &&
ModalRoute.of(context).isCurrent) {
pushRoute();
} else {
Navigator.of(context).pushNamedAndRemoveUntil('/router/main_page', (route) => false);
Navigator.of(context)
.pushNamedAndRemoveUntil('/router/main_page', (route) => false);
}
}
return event;
@ -192,10 +195,17 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
SharedPreferences sharedPreferences = await SharedPreferences.getInstance();
if (sharedPreferences.getString("token") == null ||
sharedPreferences.getString("token") == "") return;
BaseData baseDate = await ApiService(Dio(),
BaseData<UserInfo> baseDate = await ApiService(Dio(),
context: context, token: sharedPreferences.getString('token'))
.queryInfo();
sharedPreferences.setString('user', jsonEncode(baseDate.data));
String mobile = baseDate.data.phone;
if (mobile != null && mobile != "") {
xgFlutterPlugin.setAccount(mobile, AccountType.UNKNOWN);
xgFlutterPlugin.bindWithIdentifier(
identify: mobile, bindType: XGBindType.account);
}
}
requestPermission() async {
@ -234,9 +244,8 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
spreadRadius: 0,
)
],
borderRadius: BorderRadius.only(
topRight: Radius.circular(4),
topLeft: Radius.circular(4),
borderRadius: BorderRadius.vertical(
top: Radius.circular(4),
),
),
height: 82.h,

6
lib/retrofit/retrofit_api.dart

@ -38,9 +38,11 @@ import 'data/wx_pay.dart';
part 'retrofit_api.g.dart';
const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///
const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///
// const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///
// const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///
const base_url = "http://192.168.10.236:8766/app/";
const baseUrl = "http://192.168.10.236:8766/app/";
@RestApi(baseUrl: baseUrl)
abstract class ApiService {

1
lib/view_widget/store_title_tab.dart

@ -140,6 +140,7 @@ class _StoreTitleTab extends State<StoreTitleTab> {
child: SingleChildScrollView(
scrollDirection: Axis.horizontal,
controller: scrollController,
physics: BouncingScrollPhysics(),
child: Container(
height: 52.h,
constraints: BoxConstraints(minWidth: MediaQuery.of(context).size.width),

Loading…
Cancel
Save