git-svn-id: file:///srv/xfl/svn/SVN/wzx/SpeedNumCube@23858 2e29f1fe-100b-dc43-ad61-23effca57775

publish/product/app.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SpeedNumCube>
-<versioninfo minver="7.8.3" maxver="7.8.3">极速号码魔方</versioninfo>
+<versioninfo minver="7.8.3" maxver="7.8.5">极速号码魔方</versioninfo>
 <download_server>
 <url>http://app.iyoogo.com:86/product/</url>
 </download_server>
 <download_files>
 <zipfile createtime="2011-04-19 02:54:02" lastupdatetime="2011-04-19 02:54:02">7z.zip</zipfile>
 <zipfile createtime="2011-04-19 02:34:48" lastupdatetime="2011-04-19 02:34:48">7ze.zip</zipfile>
-<zipfile createtime="2020-07-23 14:57:49" lastupdatetime="2020-07-23 14:57:49">default.zip</zipfile>
+<zipfile createtime="2021-01-18 14:12:11" lastupdatetime="2021-01-18 14:12:11">default.zip</zipfile>
 <zipfile createtime="2012-04-06 14:38:26" lastupdatetime="2012-04-06 14:38:26">libgcc_s_dw2-1.zip</zipfile>
 <zipfile createtime="2012-04-06 14:38:26" lastupdatetime="2012-04-06 14:38:26">mingwm10.zip</zipfile>
 <zipfile createtime="2012-08-20 14:21:59" lastupdatetime="2012-08-20 14:21:59">mseg.zip</zipfile>
@@ -24,9 +24,9 @@
 <zipfile createtime="2013-06-28 07:44:48" lastupdatetime="2013-06-28 07:44:48">QtWebKit4.zip</zipfile>
 <zipfile createtime="2013-06-28 04:15:22" lastupdatetime="2013-06-28 04:15:22">QtXml4.zip</zipfile>
 <zipfile createtime="2018-12-13 18:38:58" lastupdatetime="2018-12-13 18:38:58">SetupSegment.zip</zipfile>
-<zipfile createtime="2020-08-31 13:51:50" lastupdatetime="2020-08-31 13:51:50">SNCCore.zip</zipfile>
+<zipfile createtime="2020-12-15 15:34:22" lastupdatetime="2020-12-15 15:34:22">SNCCore.zip</zipfile>
 <zipfile createtime="2020-06-29 13:07:34" lastupdatetime="2020-06-29 13:07:34">SNCCube.zip</zipfile>
-<zipfile createtime="2020-10-26 13:39:13" lastupdatetime="2020-10-26 13:39:13">SNCDataBase.zip</zipfile>
+<zipfile createtime="2021-01-18 14:16:16" lastupdatetime="2021-01-18 14:16:16">SNCDataBase.zip</zipfile>
 <zipfile createtime="2018-12-18 14:31:00" lastupdatetime="2018-12-18 14:31:00">SNCHelpMe.zip</zipfile>
 <zipfile createtime="2020-01-07 15:00:54" lastupdatetime="2020-01-07 15:00:54">SNCMain.zip</zipfile>
 <zipfile createtime="2015-01-25 22:21:41" lastupdatetime="2015-01-25 22:21:41">SNCNum.zip</zipfile>

publish/speednumcube.iss

@@ -7,7 +7,7 @@ Name: "cn"; MessagesFile: "compiler:Languages\ChineseSimplified.isl"
 
 [Setup]
 AppName=极速号码魔方
-AppVersion=7.8.2
+AppVersion=7.8.5
 AppPublisher=佰意兴网络科技有限公司
 AppPublisherURL=http://www.iyoogo.com:86/
 DisableDirPage = yes

publish/test/app.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SpeedNumCube>
-<versioninfo minver="7.8.3" maxver="7.8.3">极速号码魔方</versioninfo>
+<versioninfo minver="7.8.3" maxver="7.8.5">极速号码魔方</versioninfo>
 <download_server>
 <url>http://app.iyoogo.com:86/test/</url>
 </download_server>
 <download_files>
 <zipfile createtime="2011-04-19 02:54:02" lastupdatetime="2011-04-19 02:54:02">7z.zip</zipfile>
 <zipfile createtime="2011-04-19 02:34:48" lastupdatetime="2011-04-19 02:34:48">7ze.zip</zipfile>
-<zipfile createtime="2020-07-23 14:57:49" lastupdatetime="2020-07-23 14:57:49">default.zip</zipfile>
+<zipfile createtime="2021-01-18 14:12:11" lastupdatetime="2021-01-18 14:12:11">default.zip</zipfile>
 <zipfile createtime="2012-04-06 14:38:26" lastupdatetime="2012-04-06 14:38:26">libgcc_s_dw2-1.zip</zipfile>
 <zipfile createtime="2012-04-06 14:38:26" lastupdatetime="2012-04-06 14:38:26">mingwm10.zip</zipfile>
 <zipfile createtime="2012-08-20 14:21:59" lastupdatetime="2012-08-20 14:21:59">mseg.zip</zipfile>
@@ -24,9 +24,9 @@
 <zipfile createtime="2013-06-28 07:44:48" lastupdatetime="2013-06-28 07:44:48">QtWebKit4.zip</zipfile>
 <zipfile createtime="2013-06-28 04:15:22" lastupdatetime="2013-06-28 04:15:22">QtXml4.zip</zipfile>
 <zipfile createtime="2018-12-13 18:38:58" lastupdatetime="2018-12-13 18:38:58">SetupSegment.zip</zipfile>
-<zipfile createtime="2020-08-31 13:51:50" lastupdatetime="2020-08-31 13:51:50">SNCCore.zip</zipfile>
+<zipfile createtime="2020-12-15 15:34:22" lastupdatetime="2020-12-15 15:34:22">SNCCore.zip</zipfile>
 <zipfile createtime="2020-06-29 13:07:34" lastupdatetime="2020-06-29 13:07:34">SNCCube.zip</zipfile>
-<zipfile createtime="2020-10-26 13:39:13" lastupdatetime="2020-10-26 13:39:13">SNCDataBase.zip</zipfile>
+<zipfile createtime="2021-01-18 14:16:16" lastupdatetime="2021-01-18 14:16:16">SNCDataBase.zip</zipfile>
 <zipfile createtime="2018-12-18 14:31:00" lastupdatetime="2018-12-18 14:31:00">SNCHelpMe.zip</zipfile>
 <zipfile createtime="2020-01-07 15:00:54" lastupdatetime="2020-01-07 15:00:54">SNCMain.zip</zipfile>
 <zipfile createtime="2015-01-25 22:21:41" lastupdatetime="2015-01-25 22:21:41">SNCNum.zip</zipfile>

sncprojects/lib/SNCCore/numberreg.cpp

@@ -7,7 +7,8 @@ QRegExp NumberReg::getCellPhoneReg()
 {
     //return QRegExp("(13[0-9]|145|147|149|15[0-9]|16[5-7]|17[0-9]|18[0-9]|191|198|199)[0-9]{8}");
     //return QRegExp("(13[0-9]|14[0|1|4|5|6|7|8|9]|15[0-9]|16[5-7]|17[0-9]|18[0-9]|19[1|8|9])[0-9]{8}");
-    return QRegExp("(13[0-9]|14[0-9]|15[0-9]|16[0|2|5|6|7|8]|17[0-9]|18[0-9]|19[1|8|9])[0-9]{8}");
+    //return QRegExp("(13[0-9]|14[0-9]|15[0-9]|16[0|2|5|6|7|8]|17[0-9]|18[0-9]|19[1|8|9])[0-9]{8}");
+    return QRegExp("(13[0-9]|14[0-9]|15[0-9]|16[0|2|5|6|7|8]|17[0-9]|18[0-9]|19[1|3|5|8|9])[0-9]{8}");
 }
 QRegExp NumberReg::getSubStringReg()
 {
@@ -17,14 +18,16 @@ QRegExp NumberReg::getSegmentReg()
 {
     //return QRegExp("^(13[0-9]|145|147|149|15[0-9]|16[5-7]|17[0-9]|18[0-9]|191|198|199)[0-9]{4}$");  //mod by wzx
     //return QRegExp("^(13[0-9]|14[0|1|4|5|6|7|8|9]|15[0-9]|16[5-7]|17[0-9]|18[0-9]|19[1|8|9])[0-9]{4}$");  //mod by wzx
-    return QRegExp("^(13[0-9]|14[0|1|4|5|6|7|8|9]|15[0-9]|16[0|2|5|6|7|8]|17[0-9]|18[0-9]|19[1|8|9])[0-9]{4}$");  //mod by wzx
+    //return QRegExp("^(13[0-9]|14[0|1|4|5|6|7|8|9]|15[0-9]|16[0|2|5|6|7|8]|17[0-9]|18[0-9]|19[1|8|9])[0-9]{4}$");  //mod by wzx
+    return QRegExp("^(13[0-9]|14[0|1|4|5|6|7|8|9]|15[0-9]|16[0|2|5|6|7|8]|17[0-9]|18[0-9]|19[1|3|5|8|9])[0-9]{4}$");  //mod by wzx
 }
 
 //移动
 QRegExp NumberReg::getCMCCReg()
 {
     //return QRegExp("^(13[4-9]|14[4|7|8]|15[0|1|2|4|7|8|9]|165|17[8]|18[2|3|4|7|8]|198)[0-9]{8}$");
-    return QRegExp("^(13[5-9]|14[4|7|8]|15[0|1|2|4|7|8|9]|16[5]|17[8]|18[2|3|4|7|8]|198)[0-9]{8}|(134[0-8])[0-9]{7}$");
+    //return QRegExp("^(13[5-9]|14[4|7|8]|15[0|1|2|4|7|8|9]|16[5]|17[8]|18[2|3|4|7|8]|198)[0-9]{8}|(134[0-8])[0-9]{7}$");
+    return QRegExp("^(13[5-9]|14[4|7|8]|15[0|1|2|4|7|8|9]|16[5]|17[8]|18[2|3|4|7|8]|19[5|8])[0-9]{8}|(134[0-8])[0-9]{7}$");
 }
 
 //联通
@@ -37,7 +40,8 @@ QRegExp NumberReg::getCUTCReg()
 QRegExp NumberReg::getCTCCReg()
 {
     //return QRegExp("^(133|14[1|9]|15[3]|17[3|7]|18[0|1|9]|19[1|9])[0-9]{8}$");
-    return QRegExp("^(133|14[1|9]|15[3]|16[2]|17[3|7]|18[0|1|9]|19[1|9])[0-9]{8}|(1349)[0-9]{7}$");
+    //return QRegExp("^(133|14[1|9]|15[3]|16[2]|17[3|7]|18[0|1|9]|19[1|9])[0-9]{8}|(1349)[0-9]{7}$");
+    return QRegExp("^(133|14[1|9]|15[3]|16[2]|17[3|7]|18[0|1|9]|19[1|3|9])[0-9]{8}|(1349)[0-9]{7}$");
 }
 
 //虚拟运营商

sncprojects/lib/SNCDataBase/sncdatabase.cpp

@@ -219,7 +219,7 @@ bool SNCDataBase::createConnection(QString password, QString path)
 
 QString SNCDataBase::getProductName()
 {
-    return "极速号码魔方2020";
+    return "极速号码魔方2021";
 }
 QString SNCDataBase::getAppName()
 {
@@ -694,12 +694,12 @@ QMap<QString,QStringList> SNCDataBase::getLocalClientConfigs()
 }
 QString SNCDataBase::getAppVersion()
 {
-    return "7.8.3";//必须是7.1.0三段
+    return "7.8.5";//必须是7.1.0三段
 }
 
 QString SNCDataBase::getAppVersion2()
 {
-    return "7.8.3";
+    return "7.8.5";
 }
 QString SNCDataBase::getSegVersion()
 {

sncprojects/sncprojects.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by Qt Creator 2.6.1, 2020-10-26T13:28:41. -->
+<!-- Written by Qt Creator 2.6.1, 2021-01-19T11:11:04. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>