xt / Flutter-ReserveApp · Commits

Go to a project

Commit 19372b692028f6160a5ad63ebe9322a9b1f63025

Authored by “gaiyaguang”
2 parents 862ed9c7 a4b235e9
build: skipped

Merge branch 'v1.1+' of http://123.56.79.57/xt/Flutter-ReserveApp into v1.1+

Inline Side-by-side
Showing 5 changed files with 45 additions and 18 deletions
@@ -33,7 +33,7 @@ class HomePage extends StatefulWidget{ @@ -33,7 +33,7 @@ class HomePage extends StatefulWidget{
33 } 33 }
34 } 34 }
35 35
36 -class HomePageState extends State<HomePage>{ 36 +class HomePageState extends State<HomePage> with WidgetsBindingObserver{
37 37
38 38
39 List<Widget> pages = List<Widget>(); 39 List<Widget> pages = List<Widget>();
@@ -48,6 +48,7 @@ class HomePageState extends State<HomePage>{ @@ -48,6 +48,7 @@ class HomePageState extends State<HomePage>{
48 // TODO: implement initState 48 // TODO: implement initState
49 super.initState(); 49 super.initState();
50 LogUtil.v("home_initState"); 50 LogUtil.v("home_initState");
  51 + WidgetsBinding.instance.addObserver(this);
51 _currIndex=widget.initialIndex; 52 _currIndex=widget.initialIndex;
52 pages 53 pages
53 ..add(ChangeNotifierProvider<MessageModel>( 54 ..add(ChangeNotifierProvider<MessageModel>(
@@ -70,9 +71,10 @@ class HomePageState extends State<HomePage>{ @@ -70,9 +71,10 @@ class HomePageState extends State<HomePage>{
70 getUntreatedMessage(); 71 getUntreatedMessage();
71 }); 72 });
72 UpdateModel updateModel=new UpdateModel(); 73 UpdateModel updateModel=new UpdateModel();
73 - updateModel.checkUpdate(context); 74 + updateModel.checkUpdate(context,showToast: false);
74 }); 75 });
75 initPlatformState(); 76 initPlatformState();
  77 +
76 } 78 }
77 79
78 //初始化信鸽推送 80 //初始化信鸽推送
@@ -135,14 +137,20 @@ class HomePageState extends State<HomePage>{ @@ -135,14 +137,20 @@ class HomePageState extends State<HomePage>{
135 /// 上海：tpns.sh.tencent.com 137 /// 上海：tpns.sh.tencent.com
136 // XgFlutterPlugin().configureClusterDomainName("tpns.hk.tencent.com"); 138 // XgFlutterPlugin().configureClusterDomainName("tpns.hk.tencent.com");
137 139
138 - /// 设置OPPO AppKey 和 AppSecret  
139 - XgFlutterPlugin().getXgAndroidApi().enableOppoNotification();  
140 - XgFlutterPlugin().getXgAndroidApi().setOppoPushAppId(appId:"30260281");  
141 - XgFlutterPlugin().getXgAndroidApi().setOppoPushAppKey(appKey: "9b7e372f93794593953f93f118619570");  
142 - // 设置小米 AppID 和 AppKey。  
143 - XgFlutterPlugin().getXgAndroidApi().setMiPushAppId(appId:"2882303761518639456");  
144 - XgFlutterPlugin().getXgAndroidApi().setMiPushAppKey(appKey: "5231863961456");  
145 - XgFlutterPlugin().getXgAndroidApi().enableOtherPush(); 140 + if(Platform.isAndroid){
  141 + /// 设置OPPO AppKey 和 AppSecret
  142 + if(await XgFlutterPlugin().getXgAndroidApi().isOppoRom()){
  143 + XgFlutterPlugin().getXgAndroidApi().enableOppoNotification();
  144 + XgFlutterPlugin().getXgAndroidApi().setOppoPushAppId(appId:"30260281");
  145 + XgFlutterPlugin().getXgAndroidApi().setOppoPushAppKey(appKey: "9b7e372f93794593953f93f118619570");
  146 + }
  147 + // 设置小米 AppID 和 AppKey。
  148 + if(await XgFlutterPlugin().getXgAndroidApi().isMiuiRom()){
  149 + XgFlutterPlugin().getXgAndroidApi().setMiPushAppId(appId:"2882303761518639456");
  150 + XgFlutterPlugin().getXgAndroidApi().setMiPushAppKey(appKey: "5231863961456");
  151 + }
  152 + XgFlutterPlugin().getXgAndroidApi().enableOtherPush();
  153 + }
146 /// 启动TPNS服务 154 /// 启动TPNS服务
147 XgFlutterPlugin().startXg("1600012876", "INUIMFK21WGH"); 155 XgFlutterPlugin().startXg("1600012876", "INUIMFK21WGH");
148 } 156 }
@@ -175,6 +183,17 @@ class HomePageState extends State<HomePage>{ @@ -175,6 +183,17 @@ class HomePageState extends State<HomePage>{
175 } 183 }
176 184
177 @override 185 @override
  186 + void didChangeAppLifecycleState(AppLifecycleState state) {
  187 + // TODO: implement didChangeAppLifecycleState
  188 + super.didChangeAppLifecycleState(state);
  189 + switch(state){
  190 + case AppLifecycleState.resumed://应用前台可见
  191 + getUntreatedMessage();
  192 + break;
  193 + }
  194 + }
  195 +
  196 + @override
178 Widget build(BuildContext context) { 197 Widget build(BuildContext context) {
179 // TODO: implement build 198 // TODO: implement build
180 return new Scaffold( 199 return new Scaffold(
@@ -264,5 +283,6 @@ class HomePageState extends State<HomePage>{ @@ -264,5 +283,6 @@ class HomePageState extends State<HomePage>{
264 timer.cancel(); 283 timer.cancel();
265 } 284 }
266 XgFlutterPlugin().stopXg(); 285 XgFlutterPlugin().stopXg();
  286 + WidgetsBinding.instance.removeObserver(this);
267 } 287 }
268 } 288 }
@@ -31,7 +31,7 @@ class MessageDialogItem extends StatelessWidget { @@ -31,7 +31,7 @@ class MessageDialogItem extends StatelessWidget {
31 child: Stack( 31 child: Stack(
32 children: <Widget>[ 32 children: <Widget>[
33 Container( 33 Container(
34 - height: ScreenUtil().setWidth(280), 34 + height: ScreenUtil().setWidth(290),
35 margin: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(39),vertical: ScreenUtil().setWidth(12)), 35 margin: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(39),vertical: ScreenUtil().setWidth(12)),
36 padding: EdgeInsets.fromLTRB( 36 padding: EdgeInsets.fromLTRB(
37 ScreenUtil().setWidth(12), 37 ScreenUtil().setWidth(12),
@@ -32,7 +32,7 @@ class MessageItem extends StatelessWidget { @@ -32,7 +32,7 @@ class MessageItem extends StatelessWidget {
32 child: Stack( 32 child: Stack(
33 children: <Widget>[ 33 children: <Widget>[
34 Container( 34 Container(
35 - height: ScreenUtil().setWidth(280), 35 + height: ScreenUtil().setWidth(290),
36 margin: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(39),vertical: ScreenUtil().setWidth(12)), 36 margin: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(39),vertical: ScreenUtil().setWidth(12)),
37 padding: EdgeInsets.fromLTRB( 37 padding: EdgeInsets.fromLTRB(
38 ScreenUtil().setWidth(12), 38 ScreenUtil().setWidth(12),
@@ -45,8 +45,8 @@ class ContactModel{ @@ -45,8 +45,8 @@ class ContactModel{
45 phoneNum=contact.phones.first.value.trim(); 45 phoneNum=contact.phones.first.value.trim();
46 } 46 }
47 Map<String,String> callLog={ 47 Map<String,String> callLog={
48 - "phoneNum":"$phoneNum",  
49 - "sid":"154", 48 + "phoneNum":"${phoneNum.trim()}",
  49 + "sid":Provider.of<UserModel>(context,listen: false).user.sellerid,
50 "deviceId":"dhgajkhdgahghsdghdkgahd", 50 "deviceId":"dhgajkhdgahghsdghdkgahd",
51 "phoneDate":"${DateTime.now().millisecondsSinceEpoch}", 51 "phoneDate":"${DateTime.now().millisecondsSinceEpoch}",
52 "callType":"2", 52 "callType":"2",
@@ -25,7 +25,7 @@ class UpdateModel { @@ -25,7 +25,7 @@ class UpdateModel {
25 int _progress; //下载进度 25 int _progress; //下载进度
26 Function _setState; 26 Function _setState;
27 //检查更新 27 //检查更新
28 - checkUpdate(BuildContext context) async { 28 + checkUpdate(BuildContext context,{showToast=true}) async {
29 String deviceId = await Utils.getUUID(); 29 String deviceId = await Utils.getUUID();
30 UserModel userModel = Provider.of<UserModel>(context, listen: false); 30 UserModel userModel = Provider.of<UserModel>(context, listen: false);
31 int versionCode = await Utils.getCurrBuildNum(); 31 int versionCode = await Utils.getCurrBuildNum();
@@ -42,7 +42,9 @@ class UpdateModel { @@ -42,7 +42,9 @@ class UpdateModel {
42 .request<List>(context, Method.get, HttpUrl.check_update, data: params) 42 .request<List>(context, Method.get, HttpUrl.check_update, data: params)
43 .catchError((error) { 43 .catchError((error) {
44 print(error.toString()); 44 print(error.toString());
45 - Utils.showToast("当前已是最新版本"); 45 + if(showToast){
  46 + Utils.showToast("当前已是最新版本");
  47 + }
46 }); 48 });
47 if (baseResp!=null&&baseResp.code == Constant.status_success) { 49 if (baseResp!=null&&baseResp.code == Constant.status_success) {
48 LogUtil.v(baseResp.data); 50 LogUtil.v(baseResp.data);
@@ -56,10 +58,15 @@ class UpdateModel { @@ -56,10 +58,15 @@ class UpdateModel {
56 }); 58 });
57 showUpdateDialog(context, version); 59 showUpdateDialog(context, version);
58 }else{ 60 }else{
59 - Utils.showToast(baseResp?.msg??"当前已是最新版本"); 61 + if(showToast){
  62 + Utils.showToast(baseResp?.msg??"当前已是最新版本");
  63 + }
60 } 64 }
61 }else{ 65 }else{
62 - Utils.showToast(baseResp?.msg??"当前已是最新版本"); 66 + if(showToast){
  67 + Utils.showToast(baseResp?.msg??"当前已是最新版本");
  68 + }
  69 +
63 } 70 }
64 // if(Platform.isAndroid){ 71 // if(Platform.isAndroid){
65 // 72 //