Compare commits

..

No commits in common. "307ba4f020abdb41a5a1b5d93f5f88b7530fa697" and "8df34b0fa7c5a1ea88afff85bfe199f4c17fcc49" have entirely different histories.

40 changed files with 655 additions and 2003 deletions

View File

@ -1,28 +1,14 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 摄像头 -->
<uses-permission android:name="android.permission.CAMERA" />
<!-- 麦克风 -->
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<!-- 网络 -->
<uses-permission android:name="android.permission.INTERNET" />
<!-- 安装 -->
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<!-- 写权限 -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<!-- 读权限 -->
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<!-- 屏幕常亮 -->
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<!-- 高android版本读写权限 -->
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
<application
android:label="智汇享"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher"
android:enableOnBackInvokedCallback="true"
android:usesCleartextTraffic="true">
android:enableOnBackInvokedCallback="true">
<activity
android:name=".MainActivity"
android:exported="true"
@ -50,19 +36,47 @@
<meta-data
android:name="flutterEmbedding"
android:value="2" />
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_path" />
</provider>
<!-- ${applicationId}会被替换为你的应用ID -->
<!-- android:resource="@xml/file_paths"指定了存放共享文件路径的资源文件。 -->
</application>
<!-- 访问电话状态 -->
<uses-permission
android:name="android.permission.READ_PHONE_STATE"/>
<!-- 允许全部网络访问 -->
<uses-permission
android:name="android.permission.INTERNET"/>
<!-- 获取网络信息状态 -->
<uses-permission
android:name="android.permission.ACCESS_NETWORK_STATE"/>
<!-- 获取当前WiFi接入的状态以及WLAN热点的信息 -->
<uses-permission
android:name="android.permission.ACCESS_WIFI_STATE"/>
<!-- 获取当前设备存储权限 -->
<uses-permission
android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission
android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
<uses-permission
android:name="android.permission.ACTION_MANAGE_UNKNOWN_APP_SOURCES"/>
<!-- 这个权限用于app安装 -->
<uses-permission
android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
<!-- 屏幕常亮权限 -->
<uses-permission
android:name="android.permission.WAKE_LOCK"/>
<uses-permission
android:name="android.permission.CAMERA"/>
<!-- Permissions options for the `access notification policy` group -->
<uses-permission
android:name="android.permission.ACCESS_NOTIFICATION_POLICY"/>
<!-- Permissions options for the `notification` group -->
<uses-permission
android:name="android.permission.POST_NOTIFICATIONS"/>
<!-- Required to query activities that can process text, see:
https://developer.android.com/training/package-visibility and
https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
<queries>
<intent>
<action android:name="android.intent.action.PROCESS_TEXT"/>

View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Modify this file to customize your launch splash screen -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!--<item android:drawable="?android:colorBackground"/ >-->
<item android:drawable="?android:colorBackground" />
<!-- You can insert your own image assets here -->
<item>
<!-- <item>
<bitmap
android:gravity="fill"
android:gravity="center"
android:src="@mipmap/launch_image" />
</item>
</item> -->
</layer-list>

View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Modify this file to customize your launch splash screen -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!--<item android:drawable="@android:color/white"/ >-->
<item android:drawable="@android:color/white" />
<!-- You can insert your own image assets here -->
<item>
<!-- <item>
<bitmap
android:gravity="fill"
android:gravity="center"
android:src="@mipmap/launch_image" />
</item>
</item> -->
</layer-list>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 544 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 442 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 721 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 976 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<paths>
<root-path name="root" path="" />
<files-path name="files" path="" />
<cache-path name="cache" path="" />
<external-path name="external" path="" />
<external-files-path name="external_files" path="" />
<external-cache-path name="external_cache" path="" />
</paths>
</resources>

View File

@ -1,4 +1,3 @@
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
android.useAndroidX=true
android.enableJetifier=true
android.suppressUnsupportedCompileSdk=34

Binary file not shown.

Before

Width:  |  Height:  |  Size: 77 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 141 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

View File

@ -1,34 +0,0 @@
import 'package:json_annotation/json_annotation.dart';
part 'app_updata_info_entity.g.dart';
@JsonSerializable(checked: true)
class AppUpdataInfoEntity extends Object{
@JsonKey(name: 'versionCode')
int versionCode;
@JsonKey(name: 'versionName')
String versionName;
@JsonKey(name: 'updateType')
int updateType;
@JsonKey(name: 'versionDescribe')
String versionDescribe;
@JsonKey(name: 'androidurl')
String androidurl;
@JsonKey(name: 'appStoreUrl')
String appStoreUrl;
@JsonKey(name: 'apkSavePath')
String apkSavePath;
AppUpdataInfoEntity(this.versionCode,this.versionName,this.updateType,this.versionDescribe,this.androidurl,this.appStoreUrl,this.apkSavePath);
factory AppUpdataInfoEntity.fromJson(Map<String, dynamic> srcJson) => _$AppUpdataInfoEntityFromJson(srcJson);
Map<String, dynamic> toJson() => _$AppUpdataInfoEntityToJson(this);
}

View File

@ -5,10 +5,7 @@ enum AppStorageKey {
userInfo(value: 'USERINFO', label: "登录用户的基本信息"),
account(value: 'ACCOUNT', label: "用户名"),
pwd(value: 'PWD', label: "密码"),
loginType(value: 'LOGINTYPE', label: "登录类型"),
appUpDataInfo(value: 'APPUPDATAINFO', label: "app更新信息"),
isRefuseHomeCheckPermission(value: 'ISREFUSEHOMECHECKPERMISSION', label: "是否拒绝会议列表页请求文件访问权限"),
skipUpVersion(value: 'SKIPUPVERSION', label: "跳过此版本更新的版本号"),;
loginType(value: 'LOGINTYPE', label: "登录类型");
final String label;
final String value;

View File

@ -1,58 +0,0 @@
import 'package:get/get.dart';
import 'package:wgshare/common/mixins/request_tool_mixin.dart';
import 'package:wgshare/common/store/app_storage_key.dart';
import 'package:wgshare/utils/storage.dart';
import '../models/app_updata_info_entity.dart';
class BusinessStore extends GetxController with RequestToolMixin {
static BusinessStore get to => Get.find();
/// app版本更新信息
Rx<AppUpdataInfoEntity?> appUpdataInfoEntity = Rx(null);
/// 访
bool? isRefuseHomeCheckPermission = false;
///
int? skipUpVersion = 0;
BusinessStore init() {
isRefuseHomeCheckPermission = StorageService.to.read(AppStorageKey.isRefuseHomeCheckPermission.value);
skipUpVersion = StorageService.to.read(AppStorageKey.skipUpVersion.value);
try {
var appUpdataInfo = StorageService.to.read(AppStorageKey.appUpDataInfo.value);
if (appUpdataInfo != null) {
appUpdataInfoEntity.value = AppUpdataInfoEntity.fromJson(appUpdataInfo);
}
} catch (err) {
StorageService.to.remove(AppStorageKey.userInfo.value);
appUpdataInfoEntity.value = null;
}
return this;
}
/// app版本更新信息
void setAppUpdataInfo(AppUpdataInfoEntity info) {
appUpdataInfoEntity.value = info;
StorageService.to.write(AppStorageKey.appUpDataInfo.value, info);
}
/// 访
void setIsRefuseHomeCheckPermission(bool type) {
isRefuseHomeCheckPermission = type;
StorageService.to.write(AppStorageKey.isRefuseHomeCheckPermission.value, type);
}
///
void setSkipUpVersion(int code) {
skipUpVersion = code;
StorageService.to.write(AppStorageKey.skipUpVersion.value, code);
}
/// app版本更新信息
void erase() {
appUpdataInfoEntity.value = null;
StorageService.to.write(AppStorageKey.appUpDataInfo.value, null);
}
}

View File

@ -63,10 +63,7 @@ class UserStore extends GetxController with RequestToolMixin {
token = null;
loginType = null;
StorageService.to.write(AppStorageKey.userInfo.value, null);
StorageService.to.write(AppStorageKey.token.value, null);
StorageService.to.write(AppStorageKey.loginType.value, null);
// StorageService.to.erase();
StorageService.to.erase();
}
//

View File

@ -1,4 +1,3 @@
import 'package:al_downloader/al_downloader.dart';
import 'package:flutter/material.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
@ -13,7 +12,6 @@ import 'package:wgshare/utils/utils.dart';
import 'common/config/app_config.dart';
import 'common/config/colorUtils.dart';
import 'common/store/business_store.dart';
import 'routes/app_pages.dart';
import 'routes/app_routes.dart';
@ -28,10 +26,6 @@ void main() async {
/// UserStore
Get.put<UserStore>(UserStore().init());
Get.put<BusinessStore>(BusinessStore().init());
///
ALDownloader.initialize();
runApp(const MyApp());
}

View File

@ -1,20 +1,12 @@
import 'package:al_downloader/al_downloader.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:path_provider/path_provider.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:signalr_core/signalr_core.dart';
import 'package:wgshare/common/models/common/base_structure_result.dart';
import 'package:wgshare/common/mixins/request_tool_mixin.dart';
import 'package:wgshare/common/store/business_store.dart';
import 'package:wgshare/common/store/user_store.dart';
import 'package:wgshare/utils/storage.dart';
import '../../common/models/meeting_room_item.dart';
import '../../routes/app_routes.dart';
import '../../utils/permission/PermissionService.dart';
import '../../utils/toast_utils.dart';
import '../../view/public_dialog.dart';
import '../../view/upgrade/loadJson/hide_load_network_json.dart';
import 'home_state.dart';
class HomeLogic extends GetxController with RequestToolMixin {
@ -24,37 +16,6 @@ class HomeLogic extends GetxController with RequestToolMixin {
@override
void onInit() {
super.onInit();
///
HideCheckVersion hideCheckVersion = HideCheckVersion();
hideCheckVersion.doHttpHideCheckVersion();
///
/*PermissionService.checkPermission(permissionList: [Permission.manageExternalStorage]).then((value){
if(value == true){
hideCheckVersion.doHttpHideCheckVersion();
}else{
if(null == BusinessStore.to.isRefuseHomeCheckPermission || BusinessStore.to.isRefuseHomeCheckPermission == false){
publicDialog(Get.context!,
hideCancelBtn: true,
title: '请求权限说明',
describe:
'APP需要获取您的文件访问权限用以确保新版本下载后可以正常安装。',
leftBtnStr: '拒绝',
rightBtnStr: '同意',
leftBtnCallback: () {
BusinessStore.to.setIsRefuseHomeCheckPermission(true);
}, rightBtnCallback: () {
PermissionService.requestStoragePermissions().then((value){
if(value == true){
hideCheckVersion.doHttpHideCheckVersion();
}
});
});
}else{
hideCheckVersion.doHttpHideCheckVersion();
}
}
});*/
doHttpGetMeetingRoomList(state.pageIndex.value,state.pageSize.value);
}
@ -67,8 +28,7 @@ class HomeLogic extends GetxController with RequestToolMixin {
///
Future<void> doHttpGetMeetingRoomList(int pageIndex, int pageSize) async {
debugPrint("wgs输出===token${UserStore.to.token}");
BaseStructureResult<MeetingRoomItem> res = await getClient()
.getMeetingRoomList(pageIndex, pageSize);
BaseStructureResult<MeetingRoomItem> res = await getClient().getMeetingRoomList(pageIndex,pageSize);
if(null != res.data){
if(state.pageIndex == 1){
state.meetingRooms.value = res.data!.items;
@ -103,8 +63,7 @@ class HomeLogic extends GetxController with RequestToolMixin {
DateTime now = DateTime.now();
// 4, 退
if (state.currentBackPressTime == null ||
now.difference(state.currentBackPressTime!) >
const Duration(seconds: 4)) {
now.difference(state.currentBackPressTime!) > const Duration(seconds: 4)) {
state.currentBackPressTime = now;
ToastUtils.showInfo("再按一次退出");
return false;
@ -114,43 +73,5 @@ class HomeLogic extends GetxController with RequestToolMixin {
return true;
}
///
void gotoMeetingRoom(BuildContext context, int index) {
PermissionService.checkPermission(
permissionList: [Permission.microphone, Permission.camera]).then((
value) {
if (value == true) {
Get.back();
Get.toNamed(Routes.meetingMainPage,
arguments: {
"roomNumber": state.meetingRooms.value[index].roomNum
});
} else {
publicDialog(
context,
hideCancelBtn: true,
title: '请求权限说明',
describe: '进入会议室需要获取您的麦克风以及摄像头权限,用以确保能够正常参会发言。',
leftBtnStr: '拒绝',
rightBtnStr: '同意',
leftBtnCallback: () {
Get.toNamed(Routes.meetingMainPage,
arguments: {
"roomNumber": state.meetingRooms.value[index].roomNum
});
},
rightBtnCallback: () {
PermissionService.requestPermissions().then((value) {
if (value == true) {
Get.toNamed(Routes.meetingMainPage,
arguments: {
"roomNumber": state.meetingRooms.value[index].roomNum
});
}
});
}
);
}
});
}
}

View File

@ -1,5 +1,4 @@
import 'dart:async';
import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@ -10,7 +9,6 @@ import 'package:wgshare/routes/app_routes.dart';
import 'package:wgshare/utils/cus_behavior.dart';
import 'package:wgshare/utils/toast_utils.dart';
import '../../utils/color_util.dart';
import '../../view/upgrade/loadJson/load_network_json.dart';
import 'home_logic.dart';
class HomePage extends StatefulWidget {
@ -191,7 +189,11 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
),
),
onTap: () {
logic.gotoMeetingRoom(context, index);
Get.toNamed(Routes.meetingMainPage,
arguments: {
"roomNumber": state.meetingRooms
.value[index].roomNum
});
},
)
],

View File

@ -3,7 +3,6 @@ import 'dart:convert';
import 'package:crypto/crypto.dart';
import 'package:flutter/cupertino.dart';
import 'package:get/get.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:wgshare/common/mixins/request_tool_mixin.dart';
import 'package:wgshare/utils/device_info.dart';
import 'package:wgshare/utils/toast_utils.dart';
@ -11,24 +10,15 @@ import 'package:wgshare/utils/toast_utils.dart';
import '../../common/config/app_config.dart';
import '../../common/models/common/base_structure_result.dart';
import '../../common/models/user_info_entity.dart';
import '../../common/store/app_storage_key.dart';
import '../../common/store/user_store.dart';
import '../../routes/app_routes.dart';
import '../../utils/permission/PermissionService.dart';
import '../../view/public_dialog.dart';
import '../../view/upgrade/loadJson/hide_load_network_json.dart';
import '../../view/upgrade/loadJson/load_network_json.dart';
import '../../utils/storage.dart';
import 'login_state.dart';
class LoginLogic extends GetxController with RequestToolMixin {
final LoginState state = LoginState();
@override
void onInit() {
super.onInit();
HideCheckVersion hideCheckVersion = HideCheckVersion();
hideCheckVersion.doHttpHideCheckVersion();
}
@override
void onClose() {
super.onClose();

View File

@ -1,4 +1,3 @@
import 'package:al_downloader/al_downloader.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
@ -40,7 +39,7 @@ class _LoginPageState extends State<LoginPage> {
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage('assets/images/login_bg.png'),
fit: BoxFit.cover,
fit: BoxFit.fill,
),
),
child: Column(
@ -376,7 +375,6 @@ class _LoginPageState extends State<LoginPage> {
),
),
onTap: () {
ALDownloader.cancelAll();
if (state.pageState.value == 0) {
logic.doHttpLogin();
} else {

View File

@ -7,7 +7,6 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:get/get.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:signalr_core/signalr_core.dart';
import 'package:wgshare/common/store/user_store.dart';
import 'package:wgshare/utils/count_microphone_volume.dart';
@ -17,7 +16,6 @@ import '../../common/models/common/base_structure_result.dart';
import '../../common/models/meeting_room_info.dart';
import '../../common/models/meeting_room_msg.dart';
import '../../common/models/meeting_room_user.dart';
import '../../common/store/business_store.dart';
import '../../utils/agora/AgoraUtil.dart';
import '../../utils/permission/PermissionService.dart';
import '../../utils/toast_utils.dart';
@ -698,6 +696,9 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
/// ------------------------------------------------------------------------------SDK相关
/// SDK
Future<void> initRtc() async {
//
PermissionService.requestPermissions();
// RtcEngine
state.rctEngine.value = createAgoraRtcEngineEx();

View File

@ -44,9 +44,6 @@ class MeetingMainState {
/// token
late RxString meetingToken = "".obs;
///
late RxBool isCameraToMicrophonePermissions = false.obs;
///
late Rx<MeetingRoomInfo?> meetingRoomInfo = Rx(null);
/// showOkAlertDialog

View File

@ -9,7 +9,6 @@ import 'package:flutter_floating/floating/floating.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:liquid_progress_indicator_v2/liquid_progress_indicator.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:preload_page_view/preload_page_view.dart';
import 'package:wgshare/common/config/app_config.dart';
import 'package:wgshare/common/store/user_store.dart';
@ -17,8 +16,6 @@ import 'package:wgshare/utils/toast_utils.dart';
import '../../utils/color_util.dart';
import '../../utils/cus_behavior.dart';
import '../../utils/permission/PermissionService.dart';
import '../../view/public_dialog.dart';
import '../../view/view_svg_path.dart';
import 'meeting_main_logic.dart';
import 'meeting_main_state.dart';
@ -104,10 +101,8 @@ class MeetingMainPageState extends State<MeetingMainPage> {
height: 20.h,
),
onTap: () {
if (state.communicationMode.value ==
1 ||
state.communicationMode.value ==
3) {
if (state.communicationMode.value == 1 ||
state.communicationMode.value == 3) {
logic.changeMeetingAudioState(true);
}
},
@ -140,8 +135,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
Row(
children: [
Text(
state.meetingRoomInfo.value
?.roomName ??
state.meetingRoomInfo.value?.roomName ??
'',
style: TextStyle(
color: Colors.white,
@ -209,39 +203,29 @@ class MeetingMainPageState extends State<MeetingMainPage> {
// -
Visibility(
visible: state.pageState.value == 1,
child: state.isJoinSuccess.value == true &&
null != state.rctEngine.value &&
null != state.users.value &&
state.users.value.isNotEmpty
child: state.isJoinSuccess.value == true && null != state.rctEngine.value && null != state.users.value && state.users.value.isNotEmpty
? Stack(
alignment: Alignment.center,
children: [
PreloadPageView.builder(
preloadPagesCount: 2,
itemCount: 2,
itemBuilder:
(BuildContext context,
itemBuilder: (BuildContext context,
int position) =>
returnPage(position),
controller:
PreloadPageController(
controller: PreloadPageController(
initialPage: 0),
onPageChanged: (int position) {
state.pageIndex.value =
position;
if (state.isSpeak.value ==
state.pageIndex.value = position;
if (state.isSpeak.value == true &&
state.isOpenCamera.value ==
true &&
state.isOpenCamera
.value ==
true &&
state.remoteUid.value !=
"0") {
state.remoteUid.value != "0") {
if (position == 0) {
state.floating.value
?.open(context);
} else {
state.floating.value
?.close();
state.floating.value?.close();
}
}
},
@ -255,13 +239,12 @@ class MeetingMainPageState extends State<MeetingMainPage> {
Container(
width: 8.w,
height: 8.h,
margin:
const EdgeInsets.only(
margin: const EdgeInsets.only(
right: 6),
decoration: BoxDecoration(
borderRadius:
BorderRadius
.circular(8),
BorderRadius.circular(
8),
color: state.pageIndex
.value ==
0
@ -273,13 +256,12 @@ class MeetingMainPageState extends State<MeetingMainPage> {
Container(
width: 8.w,
height: 8.h,
margin:
const EdgeInsets.only(
margin: const EdgeInsets.only(
left: 6),
decoration: BoxDecoration(
borderRadius:
BorderRadius
.circular(8),
BorderRadius.circular(
8),
color: state.pageIndex
.value ==
1
@ -299,8 +281,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
)),
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
GestureDetector(
child: Container(
@ -308,8 +289,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
height: 40.h,
margin: const EdgeInsets.only(
left: 20, bottom: 40),
padding:
const EdgeInsets.only(left: 20),
padding: const EdgeInsets.only(left: 20),
decoration: BoxDecoration(
borderRadius: const BorderRadius.only(
bottomLeft: Radius.circular(56),
@ -318,14 +298,12 @@ class MeetingMainPageState extends State<MeetingMainPage> {
color: ColorUtil.Color_35_35_35_07,
border: Border.all(
width: 1.w,
color:
ColorUtil.Color_99_111_158),
color: ColorUtil.Color_99_111_158),
),
child: Row(
crossAxisAlignment:
CrossAxisAlignment.center,
mainAxisAlignment:
MainAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Image.asset(
'assets/images/meeting_main_chat.png',
@ -337,8 +315,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
'说点什么...',
style: TextStyle(
fontSize: 14.sp,
color: ColorUtil
.Color_156_156_156),
color: ColorUtil.Color_156_156_156),
)
],
),
@ -348,8 +325,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
isScrollControlled: true,
chatBottomSheet(context));
Future.delayed(
const Duration(milliseconds: 100),
() {
const Duration(milliseconds: 100), () {
state.chatController.jumpTo(state
.chatController
.position
@ -374,8 +350,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
'结束发言',
style: TextStyle(
fontSize: 14.sp,
color: ColorUtil
.Color_255_255_255),
color: ColorUtil.Color_255_255_255),
),
),
onTap: () {
@ -407,8 +382,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
? Image.asset(
state.isSpeak.value == false
? 'assets/images/meeting_main_sqfy.png'
: state.isOpenMicrophone
.value ==
: state.isOpenMicrophone.value ==
true
? 'assets/images/meeting_main_microphone_default.png'
: 'assets/images/meeting_main_sqfy.png',
@ -421,14 +395,13 @@ class MeetingMainPageState extends State<MeetingMainPage> {
height: 20.h,
child: LiquidCustomProgressIndicator(
value: state
.microphoneVolume
.value,
.microphoneVolume.value,
valueColor:
const AlwaysStoppedAnimation(
ColorUtil
.Color_2_177_136),
backgroundColor: ColorUtil
.Color_255_255_255,
backgroundColor:
ColorUtil.Color_255_255_255,
direction: Axis.vertical,
shapePath: ViewSvgPath
.getMicrpphonePath()),
@ -442,8 +415,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
Text(
state.isSpeak.value == false
? '申请发言'
: state.isOpenMicrophone.value ==
true
: state.isOpenMicrophone.value == true
? "手动静音"
: "解除静音",
style: TextStyle(
@ -459,8 +431,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
applySpeakPermissionBottomSheet(
context, 1));
} else {
if (state.isOpenMicrophone.value ==
false) {
if (state.isOpenMicrophone.value == false) {
logic.doHttpSetMicr(true);
} else {
logic.doHttpSetMicr(false);
@ -582,7 +553,8 @@ class MeetingMainPageState extends State<MeetingMainPage> {
meetingAudioFloatingLayer(),
],
))),
));
)
);
}
/// 退
@ -1017,32 +989,9 @@ class MeetingMainPageState extends State<MeetingMainPage> {
),
),
onTap: () {
PermissionService.checkPermission(permissionList: [Permission.microphone,Permission.camera]).then((value){
if(value == true){
state.defaulOpenState.value = defaulOpenState;
logic.doHttpApplySpeak();
Get.back();
}else{
publicDialog(context,
hideCancelBtn: true,
title: '请求权限说明',
describe:
'申请发言需要获取您的麦克风以及摄像头权限,用以确保能够正常进行会议。',
leftBtnStr: '拒绝',
rightBtnStr: '同意',
leftBtnCallback: () {
}, rightBtnCallback: () {
PermissionService.requestPermissions();
/*PermissionService.requestPermissions().then((value){
if(value == true){
state.defaulOpenState.value = defaulOpenState;
logic.doHttpApplySpeak();
Get.back();
}
});*/
});
}
});
},
),
)
@ -1207,8 +1156,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
style: TextStyle(
fontSize: 14.sp,
fontWeight: FontWeight.w600,
color:
ColorUtil.Color_243_243_243),
color: ColorUtil.Color_243_243_243),
),
),
SizedBox(width: 8.w),
@ -1252,8 +1200,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
children: [
Container(
child: Image.asset(
state.users.value[index]
.enableShare ==
state.users.value[index].enableShare ==
true
? 'assets/images/meeting_main_share_currently.png'
: 'assets/images/meeting_main_share_currently_n.png',
@ -1446,14 +1393,13 @@ class MeetingMainPageState extends State<MeetingMainPage> {
TextSpan(
text: state.meetingRoomMsgs.value[index].userName,
style: TextStyle(
fontSize: 12.sp,
color: ColorUtil.Color_202_202_202),
fontSize: 12.sp, color: ColorUtil.Color_202_202_202),
),
TextSpan(
text: " ${state.meetingRoomMsgs.value[index].time}",
style: TextStyle(
fontSize: 10.sp,
color: ColorUtil.Color_202_202_202),
fontSize: 10.sp, color: ColorUtil.Color_202_202_202
),
),
],
),
@ -1506,14 +1452,13 @@ class MeetingMainPageState extends State<MeetingMainPage> {
TextSpan(
text: "${state.meetingRoomMsgs.value[index].time} ",
style: TextStyle(
fontSize: 10.sp,
color: ColorUtil.Color_202_202_202),
fontSize: 10.sp, color: ColorUtil.Color_202_202_202
),
),
TextSpan(
text: state.meetingRoomMsgs.value[index].userName,
style: TextStyle(
fontSize: 12.sp,
color: ColorUtil.Color_202_202_202),
fontSize: 12.sp, color: ColorUtil.Color_202_202_202),
),
],
),
@ -1647,8 +1592,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
Text(
'主持人正在赶来的路上...',
style: TextStyle(
color: ColorUtil.Color_255_255_255,
fontSize: 14.sp),
color: ColorUtil.Color_255_255_255, fontSize: 14.sp),
)
],
),
@ -1705,15 +1649,14 @@ class MeetingMainPageState extends State<MeetingMainPage> {
return Stack(
children: [
state.cacheUsers.value[index].enableCamera == true
? state.cacheUsers.value[index].uid ==
UserStore.to.userInfoEntity.value!.uid
? state.cacheUsers.value[index].uid == UserStore.to.userInfoEntity.value!.uid
? AgoraVideoView(
controller: VideoViewController(
rtcEngine: state.rctEngine.value!,
canvas: const VideoCanvas(
uid: 0,
setupMode: VideoViewSetupMode
.videoViewSetupAdd)),
setupMode:
VideoViewSetupMode.videoViewSetupAdd)),
)
: AgoraVideoView(
controller: VideoViewController.remote(
@ -1771,8 +1714,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(2),
color: ColorUtil.Color_0_0_0_96),
child: state.cacheUsers.value[index].enableMicr ==
true
child: state.cacheUsers.value[index].enableMicr == true
? Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
@ -1796,15 +1738,14 @@ class MeetingMainPageState extends State<MeetingMainPage> {
SizedBox(
width: 70,
child: Text(
state
.cacheUsers.value[index].userName,
state.cacheUsers.value[index].userName,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 12.sp,
color:
ColorUtil.Color_255_255_255),
))
color: ColorUtil.Color_255_255_255),
)
)
],
)
: Row(
@ -1819,15 +1760,14 @@ class MeetingMainPageState extends State<MeetingMainPage> {
SizedBox(
width: 70,
child: Text(
state
.cacheUsers.value[index].userName,
state.cacheUsers.value[index].userName,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 12.sp,
color:
ColorUtil.Color_255_255_255),
))
color: ColorUtil.Color_255_255_255),
)
)
],
),
)

View File

@ -73,8 +73,6 @@ class ColorUtil {
static const Color_255_69_69 = Color.fromRGBO(255, 69, 69, 1);
static const Color_84_84_84 = Color.fromRGBO(84, 84, 84, 1);
///
/// hex, 0xffffff,
/// alpha, [0.0,1.0]

View File

@ -17,16 +17,9 @@ class AndroidPermissionHandler {
await requestMicrophonePermission();
}
Future<bool> requestCameraToMicrophonePermissions() async {
var isCameraPermission = false;
var isMicrophonePermissio = false;
if(await requestCameraPermission() == true){
isCameraPermission = true;
}
if(await requestMicrophonePermission() == true){
isMicrophonePermissio = true;
}
return isCameraPermission == true && isMicrophonePermissio == true;
Future<void> requestCameraToMicrophonePermissions() async {
await requestCameraPermission();
await requestMicrophonePermission();
}
Future<void> requestLocationPermission() async {
@ -65,12 +58,10 @@ class AndroidPermissionHandler {
}
}
Future<bool> requestCameraPermission() async {
var isCameraPermission = false;
Future<void> requestCameraPermission() async {
PermissionStatus status = await Permission.camera.request();
if (status.isGranted) {
print("Android: 摄像头权限已授予");
isCameraPermission = true;
} else if (status.isPermanentlyDenied) {
print("Android: 摄像头权限被永久拒绝,请前往设置开启");
ToastUtils.showError("权限被永久拒绝,请前往设置开启!");
@ -79,21 +70,17 @@ class AndroidPermissionHandler {
print("Android: 摄像头权限被拒绝");
ToastUtils.showError("权限被拒绝,可能会导致相关功能不可用!");
}
return isCameraPermission;
}
Future<bool> requestStoragePermission() async {
var isStoragePermission = false;
PermissionStatus status = await Permission.manageExternalStorage.request();
Future<void> requestStoragePermission() async {
PermissionStatus status = await Permission.storage.request();
if (status.isGranted) {
print("Android: 存储权限已授予");
isStoragePermission = true;
} else if (status.isPermanentlyDenied) {
print("Android: 存储权限被永久拒绝,请前往设置开启");
} else {
print("Android: 存储权限被拒绝");
}
return isStoragePermission;
}
Future<void> requestNotificationPermission() async {
@ -118,12 +105,10 @@ class AndroidPermissionHandler {
}
}
static Future<bool> requestMicrophonePermission() async {
var isMicrophonePermission = false;
static Future<void> requestMicrophonePermission() async {
PermissionStatus status = await Permission.microphone.request();
if (status.isGranted) {
print("Android: 麦克风权限已授予");
isMicrophonePermission = true;
} else if (status.isPermanentlyDenied) {
print("Android: 麦克风权限被永久拒绝,请前往设置开启");
ToastUtils.showError("权限被永久拒绝,请前往设置开启!");
@ -132,6 +117,5 @@ class AndroidPermissionHandler {
print("Android: 麦克风限被拒绝");
ToastUtils.showError("权限被拒绝,可能会导致相关功能不可用!");
}
return isMicrophonePermission;
}
}

View File

@ -13,16 +13,9 @@ class IosPermissionHandler {
await requestMicrophonePermission();
}
Future<bool> requestCameraToMicrophonePermissions() async {
var isCameraPermission = false;
var isMicrophonePermissio = false;
if(await requestCameraPermission() == true){
isCameraPermission = true;
}
if(await requestMicrophonePermission() == true){
isMicrophonePermissio = true;
}
return isCameraPermission == true && isMicrophonePermissio == true;
Future<void> requestCameraToMicrophonePermissions() async {
await requestCameraPermission();
await requestMicrophonePermission();
}
Future<void> requestLocationPermission() async {
@ -45,12 +38,10 @@ class IosPermissionHandler {
}
}
Future<bool> requestCameraPermission() async {
var isCameraPermission = false;
Future<void> requestCameraPermission() async {
PermissionStatus status = await Permission.camera.request();
if (status.isGranted) {
print("iOS: 摄像头权限已授予");
isCameraPermission = true;
} else if (status.isPermanentlyDenied) {
print("iOS: 摄像头权限被永久拒绝,请前往设置开启");
ToastUtils.showError("权限被永久拒绝,请前往设置开启!");
@ -59,21 +50,17 @@ class IosPermissionHandler {
print("iOS: 摄像头权限被拒绝");
ToastUtils.showError("权限被拒绝,可能会导致相关功能不可用!");
}
return isCameraPermission;
}
Future<bool> requestStoragePermission() async {
var isStoragePermission = false;
Future<void> requestStoragePermission() async {
PermissionStatus status = await Permission.photos.request();
if (status.isGranted) {
print("iOS: 存储权限已授予");
isStoragePermission = true;
} else if (status.isPermanentlyDenied) {
print("iOS: 存储权限被永久拒绝,请前往设置开启");
} else {
print("iOS: 存储权限被拒绝");
}
return isStoragePermission;
}
Future<void> requestNotificationPermission() async {
@ -96,12 +83,10 @@ class IosPermissionHandler {
}
}
static Future<bool> requestMicrophonePermission() async {
var isMicrophonePermission = false;
static Future<void> requestMicrophonePermission() async {
PermissionStatus status = await Permission.microphone.request();
if (status.isGranted) {
print("iOS: 麦克风权限已授予");
isMicrophonePermission = true;
} else if (status.isPermanentlyDenied) {
print("iOS: 麦克风权限被永久拒绝,请前往设置开启");
ToastUtils.showError("权限被永久拒绝,请前往设置开启!");
@ -110,6 +95,5 @@ class IosPermissionHandler {
print("iOS: 麦克风限被拒绝");
ToastUtils.showError("权限被拒绝,可能会导致相关功能不可用!");
}
return isMicrophonePermission;
}
}

View File

@ -1,47 +1,16 @@
import 'dart:io';
import 'dart:ui';
import 'package:permission_handler/permission_handler.dart';
import 'AndroidPermissionHandler.dart';
import 'IosPermissionHandler.dart';
class PermissionService {
static Future<bool> requestPermissions() async {
var isRequestPermissions = false;
static Future<void> requestPermissions() async {
if (Platform.isIOS) {
// iOS权限处理逻辑
isRequestPermissions = await IosPermissionHandler().requestCameraToMicrophonePermissions();
await IosPermissionHandler().requestCameraToMicrophonePermissions();
} else if (Platform.isAndroid) {
// Android权限处理逻辑
isRequestPermissions = await AndroidPermissionHandler().requestCameraToMicrophonePermissions();
}
return isRequestPermissions;
}
static Future<bool> requestStoragePermissions() async {
var isRequestPermissions = false;
if (Platform.isIOS) {
// iOS权限处理逻辑
isRequestPermissions = await IosPermissionHandler().requestStoragePermission();
} else if (Platform.isAndroid) {
// Android权限处理逻辑
isRequestPermissions = await AndroidPermissionHandler().requestStoragePermission();
}
return isRequestPermissions;
}
///
static Future<bool> checkPermission({required List<Permission> permissionList}) async {
var isRequestPermissions = true;
///
for (Permission permission in permissionList) {
PermissionStatus status = await permission.status;
///
if (!status.isGranted) {
isRequestPermissions = false;
await AndroidPermissionHandler().requestCameraToMicrophonePermissions();
}
}
return isRequestPermissions;
}
}

View File

@ -1,23 +0,0 @@
import 'package:flutter/cupertino.dart';
import 'package:get/get.dart';
import 'package:get/get_core/src/get_main.dart';
class RouteUtil {
/**
*
*/
static String getRoute(){
var routePath = Get.currentRoute;
return routePath;
}
/**
* context
*/
static BuildContext getContext(){
var context = Get.context!;
return context;
}
}

View File

@ -1,175 +0,0 @@
import 'dart:io';
import 'package:dio/dio.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_screenutil/src/size_extension.dart';
import 'package:get/get.dart';
import 'package:get/get_core/src/get_main.dart';
import 'package:install_plugin/install_plugin.dart';
import 'package:path_provider/path_provider.dart';
import 'package:wgshare/utils/color_util.dart';
import 'package:wgshare/utils/toast_utils.dart';
import 'package:wgshare/view/upgrade/util/load_file_cancel_request.dart';
publicDialog(BuildContext context,
{String title = "提示",
required String describe,
btnWidth = 116.0,
btnHeight = 42.0,
required String leftBtnStr,
required String rightBtnStr,
bool hideCancelBtn = false,
required Function leftBtnCallback,
required Function rightBtnCallback}) {
showDialog(
context: context,
barrierDismissible: hideCancelBtn,
builder: (_) => PopScope(
canPop: hideCancelBtn,
child: HintDialog(title, describe, btnWidth, btnHeight, leftBtnStr,
rightBtnStr, hideCancelBtn,leftBtnCallback,rightBtnCallback),
));
}
class HintDialog extends StatefulWidget {
final String title; //
final String describe; //
final double btnWidth; //
final double btnHeight; //
final String leftBtnStr; //
final String rightBtnStr; //
final bool hideCancelBtn; //btn
final Function leftBtnCallback;
final Function rightBtnCallback;
HintDialog(
this.title,
this.describe,
this.btnWidth,
this.btnHeight,
this.leftBtnStr,
this.rightBtnStr,
this.hideCancelBtn,
this.leftBtnCallback,
this.rightBtnCallback);
@override
State<StatefulWidget> createState() {
return HintDialogState();
}
}
class HintDialogState extends State<HintDialog> {
@override
void initState() {
super.initState();
}
@override
Widget build(BuildContext context) {
return Center(
child: Container(
height: 250.h,
margin: const EdgeInsets.only(left: 40, right: 40),
padding:
const EdgeInsets.only(top: 20, bottom: 20, left: 12, right: 12),
decoration: BoxDecoration(
color: const Color.fromRGBO(255, 255, 255, 1),
borderRadius: BorderRadius.circular(8),
),
child: _contentStyle(),
),
);
}
///
_contentStyle() {
return Column(
children: <Widget>[
_title(),
Expanded(
child: _hintMsg(),
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
GestureDetector(
child: Container(
width: widget.btnWidth,
height: widget.btnHeight,
decoration: const BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(99)),
color: ColorUtil.Color_230_230_230,
),
margin: const EdgeInsets.only(top: 12, left: 12),
alignment: Alignment.center,
child: Text(
widget.leftBtnStr,
style: TextStyle(
fontSize: 14.sp, color: ColorUtil.Color_255_255_255),
),
),
onTap: () {
Get.back();
widget.leftBtnCallback();
},
),
GestureDetector(
child: Container(
width: widget.btnWidth,
height: widget.btnHeight,
decoration: const BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(99)),
color: ColorUtil.Color_85_117_242,
),
margin: const EdgeInsets.only(top: 12, right: 12),
alignment: Alignment.center,
child: Text(
widget.rightBtnStr,
style: TextStyle(
fontSize: 14.sp, color: ColorUtil.Color_255_255_255),
),
),
onTap: () {
Get.back();
widget.rightBtnCallback();
},
)
],
)
],
);
}
///
_title() {
return Container(
alignment: Alignment.center,
margin: const EdgeInsets.only(bottom: 12),
child: Text(widget.title,
style: TextStyle(
fontSize: 16.sp,
color: ColorUtil.Color_85_117_242,
fontWeight: FontWeight.w600,
decoration: TextDecoration.none)),
);
}
///
_hintMsg() {
return SingleChildScrollView(
child: Container(
alignment: Alignment.topLeft,
margin: const EdgeInsets.only(left: 8, right: 8),
child: Text(widget.describe,
style: const TextStyle(
fontSize: 14,
color: ColorUtil.Color_89_88_88,
decoration: TextDecoration.none,
height: 1.4)),
),
);
}
}

View File

@ -1,218 +0,0 @@
import 'dart:io';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_screenutil/src/size_extension.dart';
import 'package:get/get.dart';
import 'package:install_plugin/install_plugin.dart';
import 'package:path_provider/path_provider.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:wgshare/utils/color_util.dart';
import 'package:wgshare/utils/toast_utils.dart';
import 'package:wgshare/view/upgrade/util/load_file_cancel_request.dart';
import '../../common/store/business_store.dart';
import '../../utils/permission/PermissionService.dart';
import '../public_dialog.dart';
hideUpgradeDialog(
BuildContext context,
String describe,
String apkSavePath,
String appStoreUrl,
int versionCode,{
btnWidth = 116.0,
btnHeight = 42.0,
bool hideCancelBtn = false,
}) {
showDialog(
context: context,
barrierDismissible: hideCancelBtn,
builder: (_) => PopScope(
canPop: hideCancelBtn,
child: HintDialog(describe, apkSavePath, appStoreUrl, versionCode, btnWidth,
btnHeight, hideCancelBtn),
));
}
class HintDialog extends StatefulWidget {
final String describe; //
final String apkSavePath;
final String appStoreUrl;
final int versionCode;
final double btnWidth; //
final double btnHeight; //
final bool hideCancelBtn; //btn
HintDialog(this.describe, this.apkSavePath, this.appStoreUrl, this.versionCode, this.btnWidth,
this.btnHeight, this.hideCancelBtn);
@override
State<StatefulWidget> createState() {
return HintDialogState();
}
}
class HintDialogState extends State<HintDialog> {
// 012
int confirmBtnType = 0;
//
String btnStr = "立即安装";
// apk路径
late String apkPath;
late loadFileCancelRequest loadRequest;
@override
void initState() {
super.initState();
}
@override
Widget build(BuildContext context) {
return Center(
child: Container(
height: 400.h,
margin: const EdgeInsets.only(left: 40, right: 40),
padding:
const EdgeInsets.only(top: 20, bottom: 20, left: 12, right: 12),
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage('assets/images/upappbg.png'),
fit: BoxFit.fill,
),
),
child: _contentStyle(),
),
);
}
///
_contentStyle() {
return Column(
children: <Widget>[
// _title(),
Expanded(
child: Container(),
),
_hintMsg(),
GestureDetector(
child: Container(
width: double.infinity,
height: 50.h,
decoration: const BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(6)),
color: ColorUtil.Color_85_117_242,
),
margin: const EdgeInsets.only(top: 12),
alignment: Alignment.center,
child: Text(
btnStr,
style: TextStyle(
fontSize: 14.sp, color: ColorUtil.Color_255_255_255),
),
),
onTap: () {
if (Platform.isIOS) {
_gotoAppStore();
} else {
if (confirmBtnType == 0) {
PermissionService.checkPermission(permissionList: [Permission.manageExternalStorage]).then((value){
if(value == true){
_installApk();
}else{
publicDialog(Get.context!,
hideCancelBtn: true,
title: '请求权限说明',
describe:
'APP需要获取您的文件访问权限用以确保新版本下载后可以正常安装。',
leftBtnStr: '拒绝',
rightBtnStr: '同意',
leftBtnCallback: () {
BusinessStore.to.setIsRefuseHomeCheckPermission(true);
}, rightBtnCallback: () {
PermissionService.requestStoragePermissions().then((value){
if(value == true){
_installApk();
}
});
});
}
});
}
/*if (confirmBtnType == 1) {
SystemNavigator.pop();
}
if (confirmBtnType == 2) {
Navigator.of(context).pop();
}*/
}
},
),
Visibility(
visible: widget.hideCancelBtn,
child: GestureDetector(
child: Container(
margin: const EdgeInsets.only(top: 20),
child: Text(
"跳过此版本",
style:
TextStyle(fontSize: 14.sp, color: ColorUtil.Color_84_84_84),
),
),
onTap: () {
BusinessStore.to.setSkipUpVersion(widget.versionCode);
Get.back();
},
),
)
],
);
}
///
_hintMsg() {
return SingleChildScrollView(
child: Container(
alignment: Alignment.topLeft,
margin: const EdgeInsets.only(),
child: Text(widget.describe,
style: const TextStyle(
fontSize: 14,
color: ColorUtil.Color_244_244_244,
decoration: TextDecoration.none,
height: 1.4)),
),
);
}
/// APK
_installApk() async {
await InstallPlugin.installApk(widget.apkSavePath, appId: "com.yuanxuan.wgshare").then((result) {
debugPrint("检查更新-安卓安装成功:$result");
/*setState(() {
confirmBtnType = 2;
btnStr = "关闭APP重新打开";
});*/
BusinessStore.to.erase();
}).catchError((error) {
debugPrint("检查更新-安卓安装失败:$error");
/*setState(() {
confirmBtnType = 2;
btnStr = "跳过";
});*/
});
}
///
_gotoAppStore() async {
await InstallPlugin.install(widget.appStoreUrl).then((result) {
debugPrint("检查更新-苹果安装成功:$result");
}).catchError((error) {
debugPrint("检查更新-苹果安装失败:$error");
});
}
}

View File

@ -1,56 +0,0 @@
import 'package:json_annotation/json_annotation.dart';
part 'upgrade_entity.g.dart';
@JsonSerializable()
class UpgradeEntity extends Object {
@JsonKey(name: 'code')
int code;
@JsonKey(name: 'message')
String message;
@JsonKey(name: 'success')
bool success;
@JsonKey(name: 'data')
UpgradeData data;
UpgradeEntity(this.code,this.message,this.success,this.data,);
factory UpgradeEntity.fromJson(Map<String, dynamic> srcJson) => _$UpgradeEntityFromJson(srcJson);
Map<String, dynamic> toJson() => _$UpgradeEntityToJson(this);
}
@JsonSerializable()
class UpgradeData extends Object {
@JsonKey(name: 'versionCode')
int versionCode;
@JsonKey(name: 'versionName')
String versionName;
@JsonKey(name: 'updateType')
int updateType;
@JsonKey(name: 'versionDescribe')
String versionDescribe;
@JsonKey(name: 'androidurl')
String androidurl;
@JsonKey(name: 'appStoreUrl')
String appStoreUrl;
UpgradeData(this.versionCode,this.versionName,this.updateType,this.versionDescribe,this.androidurl,this.appStoreUrl);
factory UpgradeData.fromJson(Map<String, dynamic> srcJson) => _$UpgradeDataFromJson(srcJson);
Map<String, dynamic> toJson() => _$UpgradeDataToJson(this);
}

View File

@ -1,149 +0,0 @@
import 'dart:convert';
import 'dart:io';
import 'package:al_downloader/al_downloader.dart';
import 'package:dio/dio.dart';
import 'package:flutter/cupertino.dart';
import 'package:package_info_plus/package_info_plus.dart';
import 'package:path_provider/path_provider.dart';
import 'package:wgshare/utils/toast_utils.dart';
import 'package:wgshare/view/upgrade/hide_upgrade_dialog.dart';
import '../../../common/models/app_updata_info_entity.dart';
import '../../../common/store/business_store.dart';
import '../../../utils/routeUtil.dart';
import 'entity/upgrade_entity.dart';
class HideCheckVersion{
Future<Map> request(String url) async{
Response response = await Dio().get(url);
return response.data;
}
Future<void> doHttpHideCheckVersion() async {
PackageInfo packageInfo = await PackageInfo.fromPlatform();
String versionCode = packageInfo.buildNumber;
if(null != BusinessStore.to.appUpdataInfoEntity.value){
ToastUtils.showSuccess('00000');
if(int.tryParse(versionCode)! < BusinessStore.to.appUpdataInfoEntity.value!.versionCode){
ToastUtils.showSuccess('11111--缓存跳过版本${BusinessStore.to.skipUpVersion}-缓存安装版本${BusinessStore.to.appUpdataInfoEntity.value!.versionCode}');
if(null != BusinessStore.to.skipUpVersion){
if(BusinessStore.to.skipUpVersion! < BusinessStore.to.appUpdataInfoEntity.value!.versionCode){
hideUpgradeDialog(
RouteUtil.getContext(),
BusinessStore.to.appUpdataInfoEntity.value!.versionDescribe,
hideCancelBtn: BusinessStore.to.appUpdataInfoEntity.value!.updateType == 1 ? false : true,
BusinessStore.to.appUpdataInfoEntity.value!.apkSavePath,
BusinessStore.to.appUpdataInfoEntity.value!.appStoreUrl,
BusinessStore.to.appUpdataInfoEntity.value!.versionCode,
);
}else{
ToastUtils.showSuccess('22222');
doHttpUp();
}
}else{
doHttpUp();
}
}else{
ToastUtils.showSuccess('33333');
BusinessStore.to.erase();
}
}else{
ToastUtils.showSuccess('44444');
doHttpUp();
}
}
Future<void> doHttpUp() async {
PackageInfo packageInfo = await PackageInfo.fromPlatform();
String versionCode = packageInfo.buildNumber;
Future<Map> map = request("http://192.168.2.9:8827/latest.json");
map.then((result) async {
var jsonStr = json.encode(result);
var listDynamic = jsonDecode(jsonStr);
UpgradeEntity upgradeEntity = UpgradeEntity.fromJson(listDynamic);
debugPrint('55555${upgradeEntity.code}-${upgradeEntity.data.versionCode}-${upgradeEntity.data.androidurl}');
ToastUtils.showSuccess('55555${upgradeEntity.code}-${upgradeEntity.data.versionCode}-${upgradeEntity.data.androidurl}');
if(upgradeEntity.code == 200){
debugPrint("检查更新-服务器版本信息:$jsonStr");
debugPrint("检查更新-当前版本号:$versionCode");
if(int.tryParse(versionCode)! < upgradeEntity.data.versionCode){
if((BusinessStore.to.skipUpVersion ?? 0) < upgradeEntity.data.versionCode){
if (Platform.isAndroid) {
/// APK
try {
var appDocDir = await getTemporaryDirectory();
var apkSavePath = "${appDocDir.path}/wgshare_up.apk";
// String url = "https://www.onlinedown.net/iopdfbhjl/632869?module=download&t=website&v=20241229163449";
// String url = "https://s3.cn-north-1.amazonaws.com.cn/mtab.kezaihui.com/apk/takeaway_phone_release_1.apk";
String url = upgradeEntity.data.androidurl;
ALDownloader.download(url,
directoryPath: "${appDocDir.path}/",
fileName: "wgshare_up.apk",
handlerInterface:
ALDownloaderHandlerInterface(progressHandler: (progress) {
debugPrint('检查更新 | 下载进度 = $progress, url = $url');
ToastUtils.showSuccess('下载进度$progress');
}, succeededHandler: () {
debugPrint('检查更新 | 下载成功, url = $url');
debugPrint('检查更新,当前路由是:${RouteUtil.getRoute()}');
debugPrint('检查更新APK保存路径$apkSavePath');
BusinessStore.to.setAppUpdataInfo(AppUpdataInfoEntity(
upgradeEntity.data.versionCode,
upgradeEntity.data.versionName,
upgradeEntity.data.updateType,
upgradeEntity.data.versionDescribe,
upgradeEntity.data.androidurl,
upgradeEntity.data.appStoreUrl,
apkSavePath
));
if (RouteUtil.getRoute() == '/meetingMainPage') {
ToastUtils.showInfo(
"新版本静默下载完毕\n将择机通知安装",
duration: const Duration(milliseconds: 3000));
} else {
hideUpgradeDialog(
RouteUtil.getContext(),
upgradeEntity.data.versionDescribe,
hideCancelBtn: upgradeEntity.data.updateType == 1 ? false : true,
apkSavePath,
'',
upgradeEntity.data.versionCode,
);
}
}, failedHandler: () {
debugPrint('检查更新 | 下载失败, url = $url');
}, pausedHandler: () {
debugPrint('检查更新 | 下载暂停, url = $url');
}));
} catch (e) {
debugPrint("检查更新-安卓下载失败:$e");
}
}else{
hideUpgradeDialog(
RouteUtil.getContext(),
upgradeEntity.data.versionDescribe,
hideCancelBtn: upgradeEntity.data.updateType == 1 ? false : true,
'',
upgradeEntity.data.appStoreUrl,
upgradeEntity.data.versionCode,
);
}
}
}else{
return;
}
}else{
return;
}
});
}
}

View File

@ -1,42 +0,0 @@
import 'dart:convert';
import 'package:dio/dio.dart';
import 'package:flutter/cupertino.dart';
import 'package:package_info_plus/package_info_plus.dart';
import '../upgrade_dialog.dart';
import 'entity/upgrade_entity.dart';
Future<Map> request(String url) async{
Response response = await Dio().get(url);
return response.data;
}
void doHttpCheckVersion(BuildContext context){
Future<Map> map = request("https://meeting-api.23544.com/meeting/mobile/latest.json");
map.then((result) async {
var jsonStr = json.encode(result);
var listDynamic = jsonDecode(jsonStr);
UpgradeEntity upgradeEntity = UpgradeEntity.fromJson(listDynamic);
if(upgradeEntity.code == 200){
PackageInfo packageInfo = await PackageInfo.fromPlatform();
String versionCode = packageInfo.buildNumber;
if(int.tryParse(versionCode)! < 2){
debugPrint("检查更新-服务器版本信息:$jsonStr");
debugPrint("检查更新-当前版本号:$versionCode");
upgradeDialog(
context,
upgradeEntity.data.versionDescribe,
hideCancelBtn: /*upgradeEntity.data.updateType == 1 ? false : true*/true,
title: '版本更新 v${upgradeEntity.data.versionName}',
/*upgradeEntity.data.url*/'https://s3.cn-north-1.amazonaws.com.cn/mtab.kezaihui.com/apk/takeaway_phone_release_1.apk',
upgradeEntity.data.appStoreUrl,
upgradeEntity.data.versionName
);
}else{
return;
}
}else{
return;
}
});
}

View File

@ -1,290 +0,0 @@
import 'dart:io';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_screenutil/src/size_extension.dart';
import 'package:get/get.dart';
import 'package:install_plugin/install_plugin.dart';
import 'package:path_provider/path_provider.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:wgshare/utils/color_util.dart';
import 'package:wgshare/utils/toast_utils.dart';
import 'package:wgshare/view/upgrade/util/load_file_cancel_request.dart';
import '../../utils/permission/PermissionService.dart';
import '../public_dialog.dart';
upgradeDialog(
BuildContext context,
String describe,
String url,
String appStoreUrl,
String versionName, {
String title = "提示",
btnWidth = 116.0,
btnHeight = 42.0,
bool hideCancelBtn = false,
}) {
showDialog(
context: context,
barrierDismissible: hideCancelBtn,
builder: (_) => PopScope(
canPop: hideCancelBtn,
child: HintDialog(title, describe, url, appStoreUrl, versionName,
btnWidth, btnHeight, hideCancelBtn),
));
}
class HintDialog extends StatefulWidget {
final String title; //
final String describe; //
final String url;
final String appStoreUrl;
final String versionName;
final double btnWidth; //
final double btnHeight; //
final bool hideCancelBtn; //btn
HintDialog(this.title, this.describe, this.url, this.appStoreUrl,
this.versionName, this.btnWidth, this.btnHeight, this.hideCancelBtn);
@override
State<StatefulWidget> createState() {
return HintDialogState();
}
}
class HintDialogState extends State<HintDialog> {
// 01234
int confirmBtnType = 0;
//
String btnStr = "立即更新";
//
double progressValue = 0.0;
// apk路径
late String apkPath;
late loadFileCancelRequest loadRequest;
@override
void initState() {
super.initState();
}
@override
Widget build(BuildContext context) {
return Center(
child: Container(
height: 400.h,
margin: const EdgeInsets.only(left: 40, right: 40),
padding:
const EdgeInsets.only(top: 20, bottom: 20, left: 12, right: 12),
decoration: BoxDecoration(
image: DecorationImage(
image: AssetImage('assets/images/upappbg.png'),
fit: BoxFit.fill,
),
),
child: _contentStyle(),
),
);
}
///
_contentStyle() {
return Column(
children: <Widget>[
// _title(),
Expanded(
child: Container(),
),
_hintMsg(),
Visibility(
visible: confirmBtnType == 1 ? true : false,
child: Container(
width: double.infinity,
height: 4.h,
color: ColorUtil.Color_85_117_242,
margin: const EdgeInsets.only(top: 12, left: 2, right: 2),
child: LinearProgressIndicator(
value: progressValue,
valueColor:
const AlwaysStoppedAnimation(ColorUtil.Color_85_117_242),
backgroundColor: ColorUtil.Color_185_184_184,
),
),
),
GestureDetector(
child: Container(
width: double.infinity,
height: 50.h,
decoration: const BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(6)),
color: ColorUtil.Color_85_117_242,
),
margin: const EdgeInsets.only(top: 12),
alignment: Alignment.center,
child: Text(
btnStr,
style: TextStyle(
fontSize: 14.sp, color: ColorUtil.Color_255_255_255),
),
),
onTap: () {
if (Platform.isIOS) {
_gotoAppStore();
} else {
if (confirmBtnType == 0) {
_downloadApk();
}
if (confirmBtnType == 1) {
Navigator.of(context).pop();
}
if (confirmBtnType == 2) {
PermissionService.checkPermission(permissionList: [Permission.manageExternalStorage]).then((value){
if(value == true){
// APK函数
_installApk(apkPath);
}else{
publicDialog(context,
hideCancelBtn: true,
title: '请求权限说明',
describe:
'APP需要获取您的文件访问权限用以确保新版本下载后可以正常安装。',
leftBtnStr: '拒绝',
rightBtnStr: '同意',
leftBtnCallback: () {
}, rightBtnCallback: () {
PermissionService.requestStoragePermissions();
});
}
});
}
if (confirmBtnType == 3) {
SystemNavigator.pop();
}
if (confirmBtnType == 4) {
Navigator.of(context).pop();
}
}
},
),
Visibility(
visible: widget.hideCancelBtn,
child: GestureDetector(
child: Container(
margin: const EdgeInsets.only(top: 20),
child: Text(
"跳过此版本",
style: TextStyle(
fontSize: 14.sp,
color: ColorUtil.Color_84_84_84
),
),
),
onTap: (){
Get.back();
},
),
)
],
);
}
///
_title() {
return Container(
alignment: Alignment.center,
margin: const EdgeInsets.only(bottom: 12),
child: Text(widget.title,
style: TextStyle(
fontSize: 16.sp,
color: ColorUtil.Color_85_117_242,
fontWeight: FontWeight.w600,
decoration: TextDecoration.none)),
);
}
///
_hintMsg() {
return SingleChildScrollView(
child: Container(
alignment: Alignment.topLeft,
margin: const EdgeInsets.only(),
child: Text(widget.describe,
style: const TextStyle(
fontSize: 14,
color: ColorUtil.Color_244_244_244,
decoration: TextDecoration.none,
height: 1.4)),
),
);
}
/// APK
_downloadApk() async {
loadRequest = loadFileCancelRequest();
try {
// apk下载路径
var appDocDir = await getTemporaryDirectory();
apkPath = "${appDocDir.path}/wgshare_${widget.versionName}.apk";
loadRequest.load(widget.url, apkPath);
loadRequest.setProgressCallbackListener((progress) {
setState(() {
progressValue = progress;
});
});
loadRequest.setSuccessCallbackListener(() {
setState(() {
confirmBtnType = 2;
btnStr = "安装";
});
});
setState(() {
confirmBtnType = 1;
btnStr = "取消";
});
} catch (e) {
debugPrint("检查更新-安卓下载失败:$e");
setState(() {
confirmBtnType = 0;
btnStr = "更新";
});
ToastUtils.showError("下载失败");
}
}
/// APK
_installApk(String path) async {
await InstallPlugin.installApk(path, appId: "com.yuanxuan.wgshare").then((result) {
debugPrint("检查更新-安卓安装成功:$result");
setState(() {
confirmBtnType = 3;
btnStr = "关闭APP重新打开";
});
}).catchError((error) {
debugPrint("检查更新-安卓安装失败:$error");
setState(() {
confirmBtnType = 4;
btnStr = "跳过";
});
});
}
///
_gotoAppStore() async {
await InstallPlugin.install(widget.appStoreUrl).then((result){
debugPrint("检查更新-苹果安装成功:$result");
}).catchError((error){
debugPrint("检查更新-苹果安装失败:$error");
});
}
}

View File

@ -1,36 +0,0 @@
import 'package:dio/dio.dart';
import 'package:flutter/cupertino.dart';
class loadFileCancelRequest{
late Function progressCallback;
late Function successCallback;
CancelToken token = CancelToken();
load(String url, String path) async {
Dio dio = Dio();
await dio.download(url, path, cancelToken: token, onReceiveProgress: (received, total) {
if (total != -1) {
//
progressCallback((received / total));
debugPrint("检查更新-下载进度:${(received / total)}");
}
}).then((onValue){
//
successCallback();
});
}
cancel() {
token.cancel('取消请求');
}
setProgressCallbackListener(Function progressCallback){
this.progressCallback = progressCallback;
}
setSuccessCallbackListener(Function successCallback){
this.successCallback = successCallback;
}
}

View File

@ -30,14 +30,6 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "6.5.0"
al_downloader:
dependency: "direct main"
description:
name: al_downloader
sha256: "00b96b113da7e013f532527238e2f8e5219834f6b4e52df6ff8b12f26eda7101"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.8.4"
analyzer:
dependency: transitive
description:
@ -355,14 +347,6 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "3.3.1"
flutter_downloader:
dependency: transitive
description:
name: flutter_downloader
sha256: "2b126083d2e6b7c09755bca12012c4c734bcf7666cf07ba00c508fcb83e8d0d7"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.11.1"
flutter_easyloading:
dependency: "direct main"
description:
@ -650,14 +634,6 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "4.0.2"
install_plugin:
dependency: "direct main"
description:
name: install_plugin
sha256: "6fb67ba0781e75de4f2f2266ed25e835bfd277c5bfc2ed034af52774355857c6"
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.1.0"
intersperse:
dependency: transitive
description:
@ -867,7 +843,7 @@ packages:
source: hosted
version: "1.9.0"
path_provider:
dependency: "direct main"
dependency: transitive
description:
name: path_provider
sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
@ -1034,14 +1010,6 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.0"
queue:
dependency: transitive
description:
name: queue
sha256: "9a41ecadc15db79010108c06eae229a45c56b18db699760f34e8c9ac9b831ff9"
url: "https://pub.flutter-io.cn"
source: hosted
version: "3.1.0+2"
retrofit:
dependency: "direct main"
description:

View File

@ -92,15 +92,6 @@ dependencies:
# 弹窗
adaptive_dialog: ^2.3.0
# 安装apk
install_plugin: ^2.1.0
# 文件目录
path_provider: ^2.0.2
# 后台下载
al_downloader: ^1.8.2
dev_dependencies:
flutter_test:
sdk: flutter