Merge branch '0530-cll' into 'main'
Fix bug 57475: save button is unavailable when mask changed See merge request kylin-desktop/kylin-nm!3
This commit is contained in:
Zhang Jiaping
commit
517c62b11a
|
|
@ -1,29 +1,576 @@
|
|||
kylin-nm (3.0.1-1) unstable; urgency=medium
|
||||
kylin-nm (3.0.1-1kylin47hw1) v101.hw; urgency=medium
|
||||
|
||||
* New upstream bugfix release.
|
||||
* BUG号：#57475 #56581
|
||||
* 需求号：无
|
||||
* 其他改动：无
|
||||
|
||||
-- handsome_feng <jianfengli@ubuntukylin.com> Sun, 27 Sep 2020 14:43:45 +0800
|
||||
-- chenlelin <chenlelin@kylinos.cn> Sun, 30 May 2021 17:03:02 +0800
|
||||
|
||||
kylin-nm (3.0.0-1) unstable; urgency=medium
|
||||
kylin-nm (3.0.1-1kylin42) v101; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
* fail to compile version kylin41, change control file then upload
|
||||
|
||||
-- handsome_feng <jianfengli@ubuntukylin.com> Wed, 26 Aug 2020 20:25:16 +0800
|
||||
-- chenlelin <chenlelin@kylinos.cn> Thu, 20 May 2021 16:28:02 +0800
|
||||
|
||||
kylin-nm (1.2.5-1) unstable; urgency=medium
|
||||
kylin-nm (3.0.1-1kylin41) v101; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
* 解决bug如下
|
||||
- 37076, 有线连接名称设置为空格时，连接后显示有误.
|
||||
- 37485, 建立有线网络的名称为空格后，界面显示异常.
|
||||
|
||||
-- handsome_feng <jianfengli@ubuntukylin.com> Mon, 06 Jul 2020 11:21:48 +0800
|
||||
-- chenlelin <chenlelin@kylinos.cn> Thu, 20 May 2021 9:28:02 +0800
|
||||
|
||||
kylin-nm (1.2.4-1) unstable; urgency=medium
|
||||
kylin-nm (3.0.1-1kylin40) v101; urgency=medium
|
||||
|
||||
* New upstream bugfix release:
|
||||
- Fix that the UI stuck under multiple user.
|
||||
- Fix that the wired network disconnected after docker started.
|
||||
- Fix the wrong device object path.
|
||||
* 解决bug如下
|
||||
- 51571, 网络工具在侧边栏消息提示描述里显示为麒麟网络工具.
|
||||
|
||||
-- handsome_feng <jianfengli@ubuntukylin.com> Wed, 15 Apr 2020 23:07:10 +0800
|
||||
-- chenlelin <chenlelin@kylinos.cn> Mon, 17 May 2021 20:28:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin39) v101; urgency=medium
|
||||
|
||||
* 解决bug如下
|
||||
- 53732, 通过DBUS获取SSID， 避免ssid存在空格时，识别错误的问题.
|
||||
- 50612, 点击桌面右下角网络图标处，开启无线网，并成功接入网络，然后点击属性无法查看网络信息.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Fri, 14 May 2021 11:12:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin38) v101; urgency=medium
|
||||
|
||||
* 解决bug如下
|
||||
- 50612, 点击桌面右下角网络图标处，开启无线网，并成功接入网络，然后点击属性无法查看网络信息.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Mon, 10 May 2021 19:12:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin37) v101; urgency=medium
|
||||
|
||||
* 解决bug如下
|
||||
- 自测bug，在连接wpa2 personal 安全类型的隐藏wifi后没有自动刷新界面.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Sat, 08 May 2021 10:12:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin36) v101; urgency=medium
|
||||
|
||||
* 将9a0的wifi6与wifi6+的代码内容合并入主分支
|
||||
* 解决bug如下
|
||||
- 43477，有线连接名称为一个空格，修改为两个空格后，连接空格有线网络，界面显示异常.
|
||||
- 43492，WiFi名称与有线名称相同时，修改有线连接ip设置，wifi的ip设置也一起修改.
|
||||
- 43625，密码策略为：每次询问这个密码类型的wifi，点击连接，该窗口置于各个角落后可全屏显示.
|
||||
- 43622，密码策略为：每次询问这个密码类型的wifi，点击连接，该窗口名称未汉化.
|
||||
- 43538，ip冲突时，会出现两次ip冲突提示.
|
||||
- 43550，编辑wifi连接-wifi界面，模式选项存在冒号，与其他不统一.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Wed, 21 Apr 2021 10:12:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin35) v101; urgency=medium
|
||||
|
||||
* 解决bug如下
|
||||
- 请确认wifi密码或无线设备的通知重复弹出(禅道45783).
|
||||
- 通过命令down掉无线网口后再恢复，图形化界面未显示“可用无线网络列表”(禅道43771).
|
||||
- 中文系统下出现英文通知(禅道45861).
|
||||
- 检测IP地址冲突的消息在侧边栏显示“未知来源”(禅道45860).
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Mon, 12 Apr 2021 20:30:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin34) v101; urgency=medium
|
||||
|
||||
* 合并代码，主线没有改动
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Wed, 31 Mar 2021 20:30:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin33) v101; urgency=medium
|
||||
|
||||
* 解决bug如下
|
||||
- WiFi-加入网络功能，输入特殊字符、字母、数字组合的名称，点击连接后kylin-nm闪退(禅道43670).
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Sat, 27 Mar 2021 15:19:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin32) v101; urgency=medium
|
||||
|
||||
* 去掉gnome-shell重新传代码
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Fri, 26 Mar 2021 19:39:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin31) v101; urgency=medium
|
||||
|
||||
* 解决中文环境右上角桌面通知显示英文的问题
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Fri, 26 Mar 2021 16:52:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin30) v101; urgency=medium
|
||||
|
||||
* 合并代码，生成与华为990的兼容代码
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Thu, 25 Mar 2021 22:17:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin29) v101; urgency=medium
|
||||
|
||||
* 解决bug如下
|
||||
- 已连接WiFi后，点击其他WiFi，不输入密码按下enter键，网络状态会显示断开，4秒左右恢复正常(禅道42279).
|
||||
- 检测IP地址冲突的消息在侧边栏显示“未知来源(禅道40848).
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Fri, 19 Mar 2021 11:10:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin28) v101; urgency=medium
|
||||
|
||||
* 解决bug如下
|
||||
- WiFi的SSID过长时，存在显示不全(禅道42130).
|
||||
- 实时流量监控显示与系统监视器中网络历史显示不同(禅道39073).
|
||||
- WiFi多次连接/取消连接，连接/断开连接后，点击连接无反应(禅道42156).
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Mon, 15 Mar 2021 9:54:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin27) v101; urgency=medium
|
||||
|
||||
* 解决bug如下
|
||||
- 修复设置ipv4地址后wifi不会自动重连的bug(禅道36571).
|
||||
- 解决在新建wifi时，选择每次询问密码后，点击保存后wifi无法自动连接的问题(禅道37735).
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Thu, 11 Mar 2021 14:41:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin26) v101; urgency=medium
|
||||
|
||||
* 解决bug如下
|
||||
- 拔掉网线，无网络断开提示(禅道39021).
|
||||
- 添加网络时，光标异常显示(禅道40360).
|
||||
- 编辑有线网络连接-修改连接名称无效(禅道41427).
|
||||
- WiFi-加入网络功能，输入特殊字符、字母、数字组合的名称，点击连接后kylin-nm闪退(禅道41156).
|
||||
- WiF连接前后强度显示不同(禅道41200).
|
||||
- WiFi-加入网络功能，输入特殊字符、字母、数字组合的名称，点击连接后kylin-nm闪退(禅道41156).
|
||||
- 英文模式下，编辑有线网络界面中设置ipv6显示不全(禅道41778).
|
||||
- 新建/编辑网络连接-右键ipv6地址设置未翻译(禅道39004).
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Tue, 9 Mar 2021 10:38:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin25) v101; urgency=medium
|
||||
|
||||
* 解决bug如下
|
||||
- 新建vpn类型网络，存在未汉化选项(禅道28635, 37516).
|
||||
- 在右下角直接添加没有设置DNS的网络，无法保存(禅道40323).
|
||||
- 打开网络连接1编辑框，通过设置修改网络连接1的DNS，导致kylin-nm闪退(禅道40219, 39889).
|
||||
- 开启特效模式后，透明度为最高时，WiFi断开按钮突兀(禅道39889).
|
||||
- 右键任务栏网络图标，设置网络的图标异常(禅道37631).
|
||||
- 已连接有线网络1，再次连接有线网络2并快速点击取消，导致有线连接1连接断开(禅道38888).
|
||||
- WiFi会显示强度为0的WiFi信号(禅道38861).
|
||||
- 有线网络A不设置DNS不能保存，切换至有存在DNS的有线网络B再切换回来后可以保存(禅道38880).
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Thu, 4 Mar 2021 10:36:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin24) v101; urgency=medium
|
||||
|
||||
* 合并master分支和990分支，产生兼容代码。
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Fri, 26 Feb 2021 10:23:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin23) v101; urgency=medium
|
||||
|
||||
* 解决在nm-connection-editor中修改wifi连接名称后，wifi列表顶部已连接wifi处显示空白的问题。
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Thu, 25 Feb 2021 19:30:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin22) v101; urgency=medium
|
||||
|
||||
* 解决bug如下
|
||||
- 存在热点类型的WiFi后，网络管理器-加入网络-多次切换网络类型，kylin-nm闪退(禅道38340).
|
||||
- 控制面板-网络-可用网络-网络连接，点击后任务栏闪烁一下(禅道38321).
|
||||
- 有线网络A不设置DNS不能保存，切换至有存在DNS的有线网络B再切换回来后可以保存(禅道38280).
|
||||
- 开启特效模式后，透明度为最高时，WiFi断开按钮突兀(禅道31245).
|
||||
- 点击任务栏-有线网络-选择任意有线网络-编辑，编辑窗口最小化后，点击任务栏网络管理图标无效(禅道38362).
|
||||
- 修复设置ipv6地址失败的Bug(禅道38287).
|
||||
- 网络管理器-连接热点WiFi后手动将被测机器拉入WiFi黑名单，网络管理状态显示异常(禅道30061).
|
||||
- 两台机器直连测试时，network-manager报错，网络自动断开(禅道38218).
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Mon, 8 Feb 2021 16:06:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin21) v101; urgency=medium
|
||||
|
||||
* 解决bug如下
|
||||
- 有线连接名称设置为空格时，连接后显示有误(禅道37076,37485).
|
||||
- 解决右键菜单设置图标显示错误的问题.
|
||||
- 在有线网络A连接时，快速点击连接有线网络B，提示网络连接失败，但最后可以成功连接网络(禅道37067).
|
||||
- 修复wifi安全性变更后无法正常连接的bug(禅道34664).
|
||||
- 修复连接vpn时有线网断开的bug(禅道34639).
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Fri, 5 Feb 2021 15:26:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin20) v101; urgency=medium
|
||||
|
||||
* 解决bug如下
|
||||
- 解决连接的一个手机的热点，在休眠后手机关闭热点，再次唤醒后这个网络工具界面依然长时间显示这个热点连接的状态.
|
||||
- 自研的网络设置界面，加入隐藏WiFi界面网络名称建议增加字符数限制(禅道36507).
|
||||
- 有线连接名称设置为空格时，连接后显示有误(禅道37076).
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Sat, 30 Jan 2021 11:46:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin19) v101; urgency=medium
|
||||
|
||||
* 解决bug如下
|
||||
- 无线网络再次连接时，没有显示网络名称(禅道36082).
|
||||
- 通过任务栏网络编辑设置界面，修改WiFi的IP地址获取方式不生效(禅道36581).
|
||||
- 解决点击wifi连接，直接弹出“请确认wifi密码或无线设备”的提示.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Thu, 28 Jan 2021 11:32:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin18) v101; urgency=medium
|
||||
|
||||
* 解决bug如下
|
||||
- 无线网络再次连接时，没有显示网络名称(禅道36082).
|
||||
- 修复侧边栏中kylin-nm的消息通知，左边没有图标的问题.
|
||||
- WiFi-加入网络-安全性气候为企业WiFi后，WiFi安全性未汉化(禅道35916).
|
||||
- 取消网络连接时提示更人性化(禅道35847).
|
||||
- 已打开网络设置消息窗口，如果有其他界面将其覆盖，再次点击网络设置按钮消息窗口不会切换到最上方(禅道27762).
|
||||
- 修复ipv6地址设置项缺失的问题(禅道19885).
|
||||
- 任务栏打开/关闭飞行模式，网络状态显示异常(禅道35669).
|
||||
- 修复wifi密码策略为当前用户存储时连接失败(禅道31154).
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Wed, 27 Jan 2021 8:55:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin17) v101; urgency=medium
|
||||
|
||||
* 解决bug如下
|
||||
- 点击网络管理-加入网络-加入企业WiFi，连接成功后，点击其他企业WiFi连接后，kylin-nm闪退(禅道30062).
|
||||
- WiFi-加入网络界面，设置WiFi安全性为企业WiFi后，切换EAP方式为非PEAP后，子验证方式不会发生改变(禅道34372).
|
||||
- WiFi-加入网络界面，设置WiFi安全性为企业WiFi后，无法切换回无安全性(禅道34362).
|
||||
- 蓝牙连接手机，本地服务中网络设置勾选“网络连接点”，有线网络界面中连接手机网络，连接失败，无法上网(禅道26026).
|
||||
- 开源工具新建WiFi类型网络成功后，kylin-nm无法自动连接(禅道31134).
|
||||
- 麒麟网络工具右键菜单设置图标不正确.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Thu, 21 Jan 2021 19:09:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin16) v101; urgency=medium
|
||||
|
||||
* 删掉用户手册
|
||||
- kylin-nm-guide.wps
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Tue, 19 Jan 2021 11:15:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin15) v101; urgency=medium
|
||||
|
||||
* 解决bug如下
|
||||
- 已经连接过的热点，修改热点密码后，再次连接时的处理逻辑不正常(禅道23827).
|
||||
- 连接加密WiFi时输入6位数错误的密码后，再输入8位数错误密码，无侧边栏提示(禅道31111).
|
||||
- 通过命令行连接wifi不成功(禅道19033).
|
||||
- 刷新wifi时，无法点击有线连接标签(禅道11957).
|
||||
- 连接后和连接前的信号显示有偏差(禅道23882).
|
||||
- 手动关闭热点/路由器时，断开WiFi无提示(禅道31168).
|
||||
- 设置有线网络不生效，断开重连后才会生效(禅道33130).
|
||||
- 双网卡情况下，点击已连接的网卡1，再点击未连接网络后，网卡2已连接网络显示错误(禅道33580).
|
||||
- 任务栏点击-wifi图标-设置-ipv4/ipv6设置，添加/删除图标不一致(禅道26445).
|
||||
- 任务栏点击-wifi图标-设置-代理设置，存在语义不清晰(禅道26450).
|
||||
* 添加用户手册
|
||||
- kylin-nm-guide.wps
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Sat, 16 Jan 2021 11:40:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin14) v101; urgency=medium
|
||||
|
||||
* 优化获取有线列表和无线列表部分的代码.
|
||||
* 解决进行网络插拔交替网线连接，概率性出现有线连接界面异常的问题(禅道32687)。
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Mon, 11 Jan 2021 18:55:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin13) v101; urgency=medium
|
||||
|
||||
* 修复是否询问密码设置与NetwordManager不互通的bug(禅道27649).
|
||||
* 修复连接企业wifi显示未提供密码的bug(禅道31120).
|
||||
* 解决双网卡情况下，切换网络连接卡顿的问题(禅道32525).
|
||||
* 添加取消连接功能.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Sat, 09 Jan 2021 15:54:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin12) v101; urgency=medium
|
||||
|
||||
* 修改有线网络设置窗口放大后概率性无法复原的问题.
|
||||
* 解决传递到侧边栏的网络信息部分为汉化的问题.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Fri, 08 Jan 2021 14:14:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin11) v101; urgency=medium
|
||||
|
||||
* 添加支持vnc功能.
|
||||
* 修复选择加入的wifi无法被扫描到的时候wifi列表显示错误的问题.
|
||||
* 修复修改ip或dns后网络循环连接的问题.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Fri, 08 Feb 2021 09:08:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin10) v101; urgency=medium
|
||||
|
||||
* 把连接隐藏wifi过程放入线程中.
|
||||
* 解决启动kylin-nm的时候，正在加载wifi列表，此时又遇到wifi列表更新，导致程序崩溃的问题.
|
||||
* 解决因使用char*，导致在网络名字很长时越界导致程序崩溃的问题.
|
||||
* 解决rfkill block all 控制面板wifi开关不同步的问题.
|
||||
* 开机后，从无线网络列表切换到有线网络列表，有线网络列表顶部为空.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Wed, 06 Feb 2021 14:49:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin9) v101; urgency=medium
|
||||
|
||||
* 解决托盘打开网络管理面板，选择WiFi->加入网络，弹出的加入WiFi窗口未汉化的问题(禅道26906).
|
||||
* 解决有时连接一个已经连接的隐藏wifi不生效的问题(禅道19017).
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Thu, 31 Dec 2020 21:27:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin8) v101; urgency=medium
|
||||
|
||||
* 修复因文本框较短导致无法显示完全较长的wifi名称.
|
||||
* 修复任务栏隐藏的情况下，点击托盘图标无法正确显示主窗口位置的问题.
|
||||
* 解决点击正在进行等待动画的托盘图标，导致程序退出的问题.
|
||||
* 解决输错两次wifi密码后，导致wifi变为每次连接需要输入密码的类型的问题.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Wed, 30 Dec 2020 19:21:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin7) v101; urgency=medium
|
||||
|
||||
* 在连接有线网时，断开与这个有线网同一个网卡的已经连接的有线网络.
|
||||
* 修复点击加入个人wifi后点击企业Wifi弹窗有误的问题.
|
||||
* 修改连接企业wifi的超时时间以保证有足够的时间验证密码.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Mon, 21 Dec 2020 17:23:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin6) v101; urgency=medium
|
||||
|
||||
* 在有多个有线连接同时被激活的情况下，有线界面将所有已连接网络显示出来.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Mon, 21 Dec 2020 9:10:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin5) v101; urgency=medium
|
||||
|
||||
* 调整主窗口到屏幕边沿的距离.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Fri, 18 Dec 2020 17:00:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin4) v101; urgency=medium
|
||||
|
||||
* 解决点击任务栏窗口退回，导致无法点击屏幕键盘输入密码的问题.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Wed, 16 Dec 2020 20:52:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin3) v101; urgency=medium
|
||||
|
||||
* 利用有线网的UUID连接断开网络，以及配置修改网络参数.
|
||||
* 解决有线网因QProcess执行问题导致获取有线列表为空的问题.
|
||||
* 修复wifi频率图标显示不准确的问题.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Tue, 15 Dec 2020 20:52:02 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin2) v101; urgency=medium
|
||||
|
||||
* 修复企业WIFI名称错误的bug
|
||||
* 修复企业WIFI无法连接的bug
|
||||
* 添加是否每次询问密码的选项
|
||||
|
||||
-- zhangjiaping <zhangjiaping@kylinos.cn> Sat, 12 Dec 2020 14:16:24 +0800
|
||||
|
||||
kylin-nm (3.0.1-1kylin1) v101; urgency=medium
|
||||
|
||||
* 添加连接企业wifi的功能.
|
||||
* 添加5G wifi优先连接功能.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Thu, 10 Dec 2020 18:46:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin31) v101; urgency=medium
|
||||
|
||||
* 解决因添加判断网络IP或DNS修改功能而导致连接wifi时会自动切换到有线界面的问题。
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Fri, 4 Dec 2020 13:29:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin30) v101; urgency=medium
|
||||
|
||||
* 解决修改网络中已经连接网络的DNS保存后，要重启系统才能生效的问题(禅道#20081)。
|
||||
* 解决在拔出网线后，删除所有有线网络，再插入网线后没有自动新建有线网络的问题。
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Thu, 3 Dec 2020 16:49:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin29) v101; urgency=medium
|
||||
|
||||
* 解决网络工具桌面通知和侧边栏通知时消息左侧无图标显示的问题(禅道#20282)。
|
||||
* 解决在nm-connection-editor中配置好网络参数后，需要重新连接才能生效的问题(禅道#26713)。
|
||||
* 添加network-manager-gnome运行依赖iputils-arping与libnotify-bin(禅道#18897)。
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Wed, 2 Dec 2020 15:56:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin28) v101; urgency=medium
|
||||
|
||||
* 托盘打开网络管理面板，选择WiFi->加入网络，弹出的加入WiFi窗口未汉化(禅道#26906)。
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Mon, 30 Nov 2020 16:10:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin27) v101; urgency=medium
|
||||
|
||||
* 英文模式下新建网络连接，会出现两个同样的连接，断开连接时也需要断开两次(禅道#26881)。
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Sat, 28 Nov 2020 16:42:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin26) v101; urgency=medium
|
||||
|
||||
* 重新上传。
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Fri, 27 Nov 2020 17:22:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin25) v101; urgency=medium
|
||||
|
||||
* 解决在中文系统环境下无法断开英文环境创建的有线网络。
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Fri, 27 Nov 2020 17:15:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin24) v101; urgency=medium
|
||||
|
||||
* 解决对已配置网络参数的有线网络进行重命名，任务栏图标点击无反应的问题(禅道#26683)
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Fri, 27 Nov 2020 16:24:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin23) v101; urgency=medium
|
||||
|
||||
* 编辑网络设置小窗不能更改网络名称(禅道#23843)
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Fri, 20 Nov 2020 15:49:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin22) v101; urgency=medium
|
||||
|
||||
* 网络连接设置窗口的网关地址栏太小了，不能完整显示(禅道#18766)
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Thu, 19 Nov 2020 18:24:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin21) v101; urgency=medium
|
||||
|
||||
* 更改系统字体再恢复默认后，编辑网络设置界面的字体未变回默认(禅道#24515)
|
||||
* 解决配置相同的IP地址，未提示冲突的问题(禅道#18879)
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Tue, 17 Nov 2020 18:38:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin20) v101; urgency=medium
|
||||
|
||||
* 解决系统在英文环境下名为'有线连接 1'的有线网名称仍然为中文的问题(禅道#18254)
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Fri, 13 Nov 2020 17:01:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin19) v101; urgency=medium
|
||||
|
||||
* 解决修改已经连接的有线网ip等信息后，需要手动断开再连接网络，界面的信息才能刷新(禅道#12034)
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Thu, 12 Nov 2020 17:01:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin18) v101; urgency=medium
|
||||
|
||||
* 解决无法实现每次连接wifi网络都需输入密码的功能(禅道#21235)
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Wed, 11 Nov 2020 17:01:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin17) v101; urgency=medium
|
||||
|
||||
* 解决706FT2000TR4253笔记本安装系统后kylin-nm无法启动的问题(禅道#18634)
|
||||
* 适配白色主题.
|
||||
* 解决右键点击任务栏关闭按钮关闭设置窗口，导致整个进程退出的问题(禅道#23712).
|
||||
* 屏蔽设置窗口的右键菜单.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Tue, 10 Nov 2020 9:47:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin16) v101; urgency=medium
|
||||
|
||||
* Internationalization of desktop notification.
|
||||
* Fix bug the network speed is 0 after plug in wireless card.
|
||||
* Fix bug ipv4 can not refresh sometimes after change the configuration of a connected wired network.
|
||||
* Fix bug can not show normal window icon in taskbar when show a config window.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Thu, 24 Sep 2020 17:13:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin15) v101; urgency=medium
|
||||
|
||||
* Fix bug switch state of kylin-nm is different from control-center.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Wed, 02 Sep 2020 14:33:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin14) v101; urgency=medium
|
||||
|
||||
* Fix bug wait 1 minute when send desktop notify if install KDE desktop environment.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Fri, 21 Aug 2020 14:53:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin13) v101; urgency=medium
|
||||
|
||||
* Fix bug can not connect wired network sometimes when there more than one wired network adapter.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Wed, 19 Aug 2020 09:15:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin12) v101; urgency=medium
|
||||
|
||||
* Upload.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Fri, 14 Aug 2020 17:20:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin11) v101; urgency=medium
|
||||
|
||||
* Fix bug show abnormal desktop notification sometimes when start operation system.
|
||||
* Fix bug show abnormal UI from wired to wireless after plug in wireless card.
|
||||
* Fix bug wired config window can not show top when clicking information of this wired net.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Fri, 14 Aug 2020 16:55:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin10) v101; urgency=medium
|
||||
|
||||
* upload.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Sat, 08 Aug 2020 10:09:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin9) v101; urgency=medium
|
||||
|
||||
* open ground glass effect by oneself.
|
||||
* change the style of wifi switch.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Sat, 08 Aug 2020 09:01:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin8) v101; urgency=medium
|
||||
|
||||
* Fix bug can not show normal in some 2k screen.
|
||||
* Add more syslog.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Mon, 20 Jul 2020 14:13:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin7) v101; urgency=medium
|
||||
|
||||
* Add function to change transparency of window by get transparent data from gsettings method.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Tue, 30 Jun 2020 09:57:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin6) v101; urgency=medium
|
||||
|
||||
* Fix bug program crash when click to configure a wifi if use old version network-manager.
|
||||
* Fix bug can not show already connected wifi in add hide wifi window if use old version network-manager.
|
||||
* Fix bug can not create new wired network.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Mon, 15 Jun 2020 16:13:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin5) v101; urgency=medium
|
||||
|
||||
* Update tray icons, delete code do not need anymore, add more comments.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Thu, 28 May 2020 15:13:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin4) v101; urgency=medium
|
||||
|
||||
* Fix bug wired list information can not refresh after changing configuration of a wired network.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Thu, 21 May 2020 9:26:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin3) v101; urgency=medium
|
||||
|
||||
* Fix bug wired network can not connected automatically after wired cable plugin.
|
||||
* Fix bug can not connect wifi any more if input wrong password at first time.
|
||||
* Fix bug wifi switch can not show correct state after turning on or off it.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Tue, 19 May 2020 20:36:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin2) v101; urgency=medium
|
||||
|
||||
* Merge code for UKUI3.0 and v100 and v101.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Thu, 19 May 2020 10:36:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1kylin1) v101; urgency=medium
|
||||
|
||||
* Rebuild kylin-nm for V10.1.
|
||||
|
||||
-- chenlelin <chenlelin@kylinos.cn> Thu, 07 May 2020 16:57:02 +0800
|
||||
|
||||
kylin-nm (1.2.3-1) unstable; urgency=medium
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
9
|
||||
|
|
@ -3,7 +3,7 @@ Section: utils
|
|||
Priority: optional
|
||||
Maintainer: Kylin Team <team+kylin@tracker.debian.org>
|
||||
Uploaders: handsome_feng <jianfengli@ubuntukylin.com>
|
||||
Build-Depends: debhelper-compat (= 12),
|
||||
Build-Depends: debhelper (>=9),
|
||||
qtbase5-dev,
|
||||
qt5-qmake,
|
||||
qtchooser,
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
3.0 (quilt)
|
||||
3.0 (native)
|
||||
|
|
|
|||
|
|
@ -113,6 +113,8 @@ ConfForm::ConfForm(QWidget *parent) :
|
|||
ui->cbMask->addItem("255.255.0.0"); //16
|
||||
ui->cbMask->addItem("255.0.0.0"); //8
|
||||
|
||||
connect(ui->cbMask, SIGNAL(currentIndexChanged(int)), this, SLOT(cbMaskChanged(int)));
|
||||
|
||||
ui->btnCancel->setText(tr("Cancel"));//"取消"
|
||||
ui->btnSave->setText(tr("Save"));//"保存"
|
||||
ui->btnCreate->setText(tr("Ok"));//"确定"
|
||||
|
|
@ -224,6 +226,8 @@ void ConfForm::setProp(QString connName, QString uuidName, QString v4method, QSt
|
|||
} else {
|
||||
ui->cbMask->setCurrentIndex(0);
|
||||
}
|
||||
|
||||
ui->btnSave->setEnabled(false);
|
||||
}
|
||||
|
||||
//点击了创建新的网络的按钮
|
||||
|
|
@ -682,6 +686,11 @@ void ConfForm::cbTypeChanged(int index)
|
|||
}
|
||||
}
|
||||
|
||||
void ConfForm::cbMaskChanged(int index)
|
||||
{
|
||||
this->setEnableOfBtn();
|
||||
}
|
||||
|
||||
//编辑网络名称
|
||||
void ConfForm::on_leName_textEdited(const QString &arg1)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ public:
|
|||
|
||||
public slots:
|
||||
void cbTypeChanged(int index);
|
||||
void cbMaskChanged(int index);
|
||||
void changeEnableCheckIp();
|
||||
|
||||
protected:
|
||||
|
|
|
|||
|
|
@ -83,7 +83,6 @@ void KSimpleNM::execGetWifiList(const QString& wname, const bool &isHuaweiPc)
|
|||
return;
|
||||
}
|
||||
isExecutingGetWifiList = true;
|
||||
qDebug()<< __FUNCTION__<<__LINE__;
|
||||
shellOutputWifi = "";
|
||||
QString cmd;
|
||||
//将ssid放置在最后一列以防ssid存在中文或特殊字符导致其后面的列不对齐
|
||||
|
|
@ -137,7 +136,6 @@ void KSimpleNM::finishedProcessWifi(int msg)
|
|||
QStringList slist = shellOutputWifi.split("\n");
|
||||
emit getWifiListFinished(slist);
|
||||
isExecutingGetWifiList = false;
|
||||
qDebug()<< __FUNCTION__<<__LINE__;
|
||||
}
|
||||
void KSimpleNM::finishedProcessConn(int msg)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1720,7 +1720,11 @@ void KylinDBus::onAutoConnect()
|
|||
{
|
||||
//syslog(LOG_DEBUG, "Receive a auto-connect signal to reconnect wifi");
|
||||
qDebug() << Q_FUNC_INFO << "Receive a auto-connect signal to reconnect wifi";
|
||||
mw->toReconnectWifi();
|
||||
if (!mw->isRadioWifiTurningOn) {
|
||||
mw->toReconnectWifi();
|
||||
} else {
|
||||
qDebug() << Q_FUNC_INFO << "but need waiting turn on wifi switch, will not reconnect wifi";
|
||||
}
|
||||
}
|
||||
|
||||
//有线网属性变化时，执行该函数。由于可能在短时间收到几条相同属性变化信息，所以在短时间内，执行一次
|
||||
|
|
@ -1960,7 +1964,7 @@ void KylinDBus::requestScanWifi()
|
|||
QDBusConnection::systemBus() );
|
||||
QMap<QString, QVariant> my_map;
|
||||
my_map = {};
|
||||
interface.call("RequestScan", my_map); //get accesspoint for each wifi
|
||||
interface.call("RequestScan", my_map);
|
||||
}
|
||||
|
||||
//显示桌面通知
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ int main(int argc, char *argv[])
|
|||
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
|
||||
|
||||
QApplication a(argc, argv);
|
||||
qInstallMessageHandler(messageOutput);
|
||||
//qInstallMessageHandler(messageOutput);
|
||||
|
||||
openlog(LOG_IDENT, LOG_NDELAY | LOG_NOWAIT | LOG_PID, LOG_USER);
|
||||
qDebug()<<"Kylin Network Manager Is Already Launched";
|
||||
|
|
|
|||
|
|
@ -561,6 +561,7 @@ void MainWindow::initTimer()
|
|||
numberForWifiScan = 0;
|
||||
QObject::connect(this, SIGNAL(loadWifiListAfterScan()), this, SLOT(onLoadWifiListAfterScan()));
|
||||
QObject::connect(this, SIGNAL(refreshWifiListAfterScan()), this, SLOT(onRefreshWifiListAfterScan()));
|
||||
QObject::connect(this, SIGNAL(requestReconnecWifi()), this, SLOT(onRequestReconnecWifi()));
|
||||
checkWifiListChanged = new QTimer(this);
|
||||
checkWifiListChanged->setTimerType(Qt::PreciseTimer);
|
||||
QObject::connect(checkWifiListChanged, SIGNAL(timeout()), this, SLOT(onRequestScanAccesspoint()));
|
||||
|
|
@ -1206,6 +1207,7 @@ void MainWindow::onBtnWifiClicked(int flag)
|
|||
if (is_fly_mode_on == 0) {
|
||||
//on_btnWifiList_clicked();
|
||||
is_stop_check_net_state = 1;
|
||||
isRadioWifiTurningOn = true;
|
||||
objKyDBus->setWifiCardState(true);
|
||||
objKyDBus->setWifiSwitchState(true);
|
||||
|
||||
|
|
@ -1225,6 +1227,7 @@ void MainWindow::onBtnWifiClicked(int flag)
|
|||
if (is_fly_mode_on == 0) {
|
||||
//on_btnWifiList_clicked();
|
||||
is_stop_check_net_state = 1;
|
||||
isRadioWifiTurningOn = true;
|
||||
lbTopWifiList->show();
|
||||
btnAddNet->show();
|
||||
|
||||
|
|
@ -1336,7 +1339,6 @@ void MainWindow::on_btnWifiList_clicked()
|
|||
{
|
||||
is_stop_check_net_state = 1;
|
||||
current_wifi_list_state = LOAD_WIFI_LIST;
|
||||
qDebug()<<__FUNCTION__<< __LINE__<<current_wifi_list_state;
|
||||
this->is_btnWifiList_clicked = 1;
|
||||
this->is_btnLanList_clicked = 0;
|
||||
end_rcv_rates = 0;
|
||||
|
|
@ -1372,12 +1374,14 @@ void MainWindow::on_btnWifiList_clicked()
|
|||
btnWireless->setSwitchStatus(true);
|
||||
lbTopWifiList->show();
|
||||
btnAddNet->show();
|
||||
|
||||
this->startLoading();
|
||||
if (isHuaWeiPC) {
|
||||
QtConcurrent::run([=](){
|
||||
QtConcurrent::run([=]() {
|
||||
isScaningWifi = true;
|
||||
objKyDBus->requestScanWifi(); //要求后台扫描AP
|
||||
sleep(2);
|
||||
isScaningWifi = false;
|
||||
qDebug() << "scan finished, will load wifi list";
|
||||
emit loadWifiListAfterScan();
|
||||
});
|
||||
} else {
|
||||
|
|
@ -1442,8 +1446,8 @@ void MainWindow::on_btnWifiList_clicked()
|
|||
void MainWindow::onLoadWifiListAfterScan()
|
||||
{
|
||||
current_wifi_list_state = LOAD_WIFI_LIST;
|
||||
qDebug()<<__FUNCTION__<< __LINE__<<current_wifi_list_state;
|
||||
this->ksnm->execGetWifiList(this->wcardname, this->isHuaWeiPC); //加载wifi列表
|
||||
objKyDBus->getWirelessCardName();
|
||||
}
|
||||
|
||||
void MainWindow::on_wifi_changed()
|
||||
|
|
@ -1746,7 +1750,6 @@ void MainWindow::onRequestRevalueUpdateWifi()
|
|||
{
|
||||
is_stop_check_net_state = 1;
|
||||
current_wifi_list_state = LOAD_WIFI_LIST;
|
||||
qDebug()<<__FUNCTION__<< __LINE__<<current_wifi_list_state;
|
||||
}
|
||||
|
||||
// 获取wifi列表回调
|
||||
|
|
@ -1776,7 +1779,6 @@ void MainWindow::getWifiListDone(QStringList slist)
|
|||
//getFinalWifiList(slist);
|
||||
}
|
||||
}
|
||||
qDebug()<<__FUNCTION__<< __LINE__<<current_wifi_list_state;
|
||||
if (current_wifi_list_state == RECONNECT_WIFI) {
|
||||
//qDebug()<<"======优选后的列表为======";
|
||||
//foreach (QString line, slist) {
|
||||
|
|
@ -1785,12 +1787,11 @@ void MainWindow::getWifiListDone(QStringList slist)
|
|||
//qDebug()<<"========================";
|
||||
QVector<structWifiProperty> targetWifiStructList = connectableWifiPriorityList(slist);
|
||||
if (!targetWifiStructList.isEmpty()) {
|
||||
qDebug()<< __FUNCTION__<<__LINE__<<"current_wifi_list_state="<<current_wifi_list_state<<"isReconnectingWifi="<<isReconnectingWifi;
|
||||
if (!isReconnectingWifi) {
|
||||
isReconnectingWifi = true; //保证对于连续发出的重连信号，只处理第一个
|
||||
QtConcurrent::run([=]() {
|
||||
int current_try_time = 0;
|
||||
canReconnectWifiTimeInterval = false;
|
||||
ifCanReconnectWifiNow = false;
|
||||
//若使用配置文件连接失败且还有可以回连的wifi，继续尝试回连下一个
|
||||
QStringList tried_list;
|
||||
for (current_try_time; current_try_time < targetWifiStructList.length(); current_try_time++) {
|
||||
|
|
@ -1823,7 +1824,7 @@ void MainWindow::getWifiListDone(QStringList slist)
|
|||
tried_list.append(wifiSsid);
|
||||
}
|
||||
isReconnectingWifi = false;
|
||||
timeIntervalToConnectWifi();
|
||||
ifCanReconnectWifiNow = true;
|
||||
current_wifi_list_state = LOAD_WIFI_LIST;
|
||||
});
|
||||
}
|
||||
|
|
@ -3484,16 +3485,31 @@ void MainWindow::disNetDone()
|
|||
|
||||
void MainWindow::enWifiDone()
|
||||
{
|
||||
current_wifi_list_state = LOAD_WIFI_LIST;
|
||||
if (is_btnWifiList_clicked) {
|
||||
this->ksnm->execGetWifiList(this->wcardname, this->isHuaWeiPC);
|
||||
if (isHuaWeiPC) {
|
||||
// QtConcurrent::run([=]() {
|
||||
// if (is_btnWifiList_clicked) {
|
||||
// sleep(4);
|
||||
// objKyDBus->requestScanWifi(); //要求后台扫描AP
|
||||
// emit loadWifiListAfterScan();
|
||||
// }
|
||||
// });
|
||||
|
||||
QtConcurrent::run([=]() {
|
||||
sleep(1);
|
||||
isRadioWifiTurningOn = false;
|
||||
qDebug()<<"debug: already turn on the switch of wifi network";
|
||||
//syslog(LOG_DEBUG, "Already turn on the switch of wifi network");
|
||||
});
|
||||
} else {
|
||||
//on_btnWifiList_clicked();
|
||||
current_wifi_list_state = LOAD_WIFI_LIST;
|
||||
if (is_btnWifiList_clicked) {
|
||||
this->ksnm->execGetWifiList(this->wcardname, this->isHuaWeiPC);
|
||||
}
|
||||
objKyDBus->getWirelessCardName();
|
||||
qDebug()<<"debug: already turn on the switch of wifi network";
|
||||
//syslog(LOG_DEBUG, "Already turn on the switch of wifi network");
|
||||
}
|
||||
|
||||
objKyDBus->getWirelessCardName();
|
||||
qDebug()<<"debug: already turn on the switch of wifi network";
|
||||
//syslog(LOG_DEBUG, "Already turn on the switch of wifi network");
|
||||
}
|
||||
void MainWindow::disWifiDone()
|
||||
{
|
||||
|
|
@ -3567,24 +3583,14 @@ void MainWindow::on_btnHotspotState()
|
|||
//执行wifi的重新连接
|
||||
void MainWindow::toReconnectWifi()
|
||||
{
|
||||
qDebug()<<__FUNCTION__<<__LINE__<<"canReconnectWifiTimeInterval="<<canReconnectWifiTimeInterval;
|
||||
if (canReconnectWifiTimeInterval) {
|
||||
// canReconnectWifiTimeInterval = false;
|
||||
// QTimer::singleShot(2*1000, this, SLOT(timeIntervalToConnectWifi() ));
|
||||
|
||||
if (ifCanReconnectWifiNow) {
|
||||
if (isHuaWeiPC) {
|
||||
current_wifi_list_state = RECONNECT_WIFI;
|
||||
qDebug()<<__FUNCTION__<<__LINE__<<"current_wifi_list_state="<<current_wifi_list_state;
|
||||
this->ksnm->execGetWifiList(this->wcardname, this->isHuaWeiPC);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void MainWindow::timeIntervalToConnectWifi()
|
||||
{
|
||||
canReconnectWifiTimeInterval = true;
|
||||
}
|
||||
|
||||
//处理外界对网络的连接与断开
|
||||
void MainWindow::onExternalConnectionChange(QString type, bool isConnUp)
|
||||
{
|
||||
|
|
@ -3804,7 +3810,6 @@ void MainWindow::onRequestScanAccesspoint()
|
|||
|
||||
if (loop_iface->wstate != 2) {
|
||||
current_wifi_list_state = UPDATE_WIFI_LIST;
|
||||
qDebug()<<__FUNCTION__<< __LINE__<<current_wifi_list_state;
|
||||
this->ksnm->execGetWifiList(this->wcardname, this->isHuaWeiPC); //更新wifi列表
|
||||
}
|
||||
|
||||
|
|
@ -3846,10 +3851,14 @@ void MainWindow::toScanWifi(bool isShow)
|
|||
void MainWindow::onRefreshWifiListAfterScan()
|
||||
{
|
||||
current_wifi_list_state = UPDATE_WIFI_LIST;
|
||||
qDebug()<<__FUNCTION__<< __LINE__<<current_wifi_list_state;
|
||||
this->ksnm->execGetWifiList(this->wcardname, this->isHuaWeiPC); //更新wifi列表
|
||||
}
|
||||
|
||||
void MainWindow::onRequestReconnecWifi()
|
||||
{
|
||||
toReconnectWifi();
|
||||
}
|
||||
|
||||
void MainWindow::on_setNetSpeed()
|
||||
{
|
||||
if (this->isVisible() && is_stop_check_net_state==0) {
|
||||
|
|
@ -4247,9 +4256,17 @@ int MainWindow::getScreenGeometry(QString methodName)
|
|||
|
||||
void MainWindow::requestRefreshWifiList()
|
||||
{
|
||||
current_wifi_list_state = REFRESH_WIFI;
|
||||
syslog(LOG_DEBUG, "[%s++%d] state[%d]", __FUNCTION__, __LINE__, current_wifi_list_state);
|
||||
this->ksnm->execGetWifiList(this->wcardname, this->isHuaWeiPC);
|
||||
if (isHuaWeiPC) {
|
||||
QtConcurrent::run([=](){
|
||||
objKyDBus->requestScanWifi(); //要求后台扫描AP
|
||||
sleep(2);
|
||||
emit refreshWifiListAfterScan();
|
||||
});
|
||||
} else {
|
||||
current_wifi_list_state = REFRESH_WIFI;
|
||||
syslog(LOG_DEBUG, "[%s++%d] state[%d]", __FUNCTION__, __LINE__, current_wifi_list_state);
|
||||
this->ksnm->execGetWifiList(this->wcardname, this->isHuaWeiPC);
|
||||
}
|
||||
}
|
||||
|
||||
/* get primary screen changed */
|
||||
|
|
@ -4331,10 +4348,10 @@ void MainWindow::rfkillEnableWifiDone()
|
|||
if (is_btnWifiList_clicked) {
|
||||
this->ksnm->execGetWifiList(this->wcardname, this->isHuaWeiPC);
|
||||
} else {
|
||||
// on_btnWifiList_clicked();
|
||||
//on_btnWifiList_clicked();
|
||||
}
|
||||
|
||||
objKyDBus->getWirelessCardName();
|
||||
qDebug()<<"debug: already turn on the switch of wifi network";
|
||||
//syslog(LOG_DEBUG, "Already turn on the switch of wifi network");
|
||||
qDebug()<<"debug: already turn on the switch of wifi network by keyboard button";
|
||||
//syslog(LOG_DEBUG, "Already turn on the switch of wifi network by keyboard button");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -183,10 +183,12 @@ public:
|
|||
bool isToSetWifiValue = true; //本次执行是否进行赋值
|
||||
bool isReconnectingWifi = false; //是否正在执行wifi的回连
|
||||
bool isReconnectingLan = false; //是否正在执行lan的回连
|
||||
bool isScaningWifi = false; //是否正在进行扫描
|
||||
int addNumberForWifi = 0; //短时间内收到关于wifi连接信号的次数
|
||||
bool isHuaWeiPC;
|
||||
bool isHandlingWiredCableOn = false;
|
||||
bool canReconnectWifiTimeInterval = true;
|
||||
bool ifCanReconnectWifiNow = true;
|
||||
bool isRadioWifiTurningOn = false; //是否正在打开wifi开关
|
||||
QVector<QStringList> dbus_wifiList; //其他组件通过dbus接口获取到的wifi列表,第一个元素一定为已连接wifi，若没有已连接wifi则显示为--
|
||||
void requestRefreshWifiList(); //申请刷新wifi列表
|
||||
|
||||
|
|
@ -233,6 +235,7 @@ public slots:
|
|||
void onRequestRefreshWifiList();
|
||||
void onRefreshWifiListAfterScan();
|
||||
void onLoadWifiListAfterScan();
|
||||
void onRequestReconnecWifi();
|
||||
|
||||
//flag =0或1为普通点击、2为收到打开信息、3为收到关闭信息、4为无线网卡插入、5为无线网卡拔出
|
||||
void onBtnWifiClicked(int flag = 0);
|
||||
|
|
@ -242,7 +245,6 @@ public slots:
|
|||
void checkIfConnectedWifiExist();
|
||||
|
||||
void toReconnectWifi();
|
||||
void timeIntervalToConnectWifi();
|
||||
|
||||
void rfkillDisableWifiDone();
|
||||
void rfkillEnableWifiDone();
|
||||
|
|
@ -424,6 +426,7 @@ signals:
|
|||
void wiredConnectionAdded();
|
||||
void wiredConnectionRemoved();
|
||||
void actWiredConnectionChanged();
|
||||
void requestReconnecWifi();
|
||||
};
|
||||
|
||||
#endif // MAINWINDOW_H
|
||||
|
|
|
|||
Loading…
Reference in New Issue