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

publish/product/app.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SpeedNumCube>
-<versioninfo minver="7.5.5" maxver="7.6.2">极速号码魔方</versioninfo>
+<versioninfo minver="7.6.0" maxver="7.6.3">极速号码魔方</versioninfo>
 <download_server>
 <url>http://app.iyoogo.com:86/product/</url>
 </download_server>
@@ -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="2019-04-23 19:07:42" lastupdatetime="2019-04-23 19:07:42">SNCCore.zip</zipfile>
+<zipfile createtime="2019-06-03 15:50:48" lastupdatetime="2019-06-03 15:50:48">SNCCore.zip</zipfile>
 <zipfile createtime="2018-12-18 14:31:44" lastupdatetime="2018-12-18 14:31:44">SNCCube.zip</zipfile>
-<zipfile createtime="2019-04-24 09:55:35" lastupdatetime="2019-04-24 09:55:35">SNCDataBase.zip</zipfile>
+<zipfile createtime="2019-06-03 16:17:57" lastupdatetime="2019-06-03 16:17:57">SNCDataBase.zip</zipfile>
 <zipfile createtime="2018-12-18 14:31:00" lastupdatetime="2018-12-18 14:31:00">SNCHelpMe.zip</zipfile>
 <zipfile createtime="2018-12-18 14:36:21" lastupdatetime="2018-12-18 14:36:21">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.6.2
+AppVersion=7.6.3
 AppPublisher=佰意兴网络科技有限公司
 AppPublisherURL=http://www.iyoogo.com:86/
 DisableDirPage = yes

publish/test/app.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SpeedNumCube>
-<versioninfo minver="7.5.5" maxver="7.6.2">极速号码魔方</versioninfo>
+<versioninfo minver="7.6.0" maxver="7.6.3">极速号码魔方</versioninfo>
 <download_server>
 <url>http://app.iyoogo.com:86/test/</url>
 </download_server>
@@ -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="2019-04-23 19:07:42" lastupdatetime="2019-04-23 19:07:42">SNCCore.zip</zipfile>
+<zipfile createtime="2019-06-03 15:50:48" lastupdatetime="2019-06-03 15:50:48">SNCCore.zip</zipfile>
 <zipfile createtime="2018-12-18 14:31:44" lastupdatetime="2018-12-18 14:31:44">SNCCube.zip</zipfile>
-<zipfile createtime="2019-04-24 09:55:35" lastupdatetime="2019-04-24 09:55:35">SNCDataBase.zip</zipfile>
+<zipfile createtime="2019-06-03 16:17:57" lastupdatetime="2019-06-03 16:17:57">SNCDataBase.zip</zipfile>
 <zipfile createtime="2018-12-18 14:31:00" lastupdatetime="2018-12-18 14:31:00">SNCHelpMe.zip</zipfile>
 <zipfile createtime="2018-12-18 14:36:21" lastupdatetime="2018-12-18 14:36:21">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

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

sncprojects/lib/SNCDataBase/sncdatabase.cpp

@@ -632,12 +632,12 @@ QMap<QString,QStringList> SNCDataBase::getLocalClientConfigs()
 }
 QString SNCDataBase::getAppVersion()
 {
-    return "7.6.2";//必须是7.1.0三段
+    return "7.6.3";//必须是7.1.0三段
 }
 
 QString SNCDataBase::getAppVersion2()
 {
-    return "7.6.2";
+    return "7.6.3";
 }
 QString SNCDataBase::getSegVersion()
 {
@@ -1195,14 +1195,22 @@ QStringList SNCDataBase::getSegmentByCityAndCorp(QString city, QString corp)
     cmcc = getCMCC();
     cutc = getCUTC();
     ctcc = getCTCC();
-    if(corp=="CMCC")
+
+    if(corp=="CMCC") {
         where +=" and substr(seg,1,3) in ("+cmcc+")";
-    else if(corp=="CUTC")
+        where +=" and substr(seg,1,4) <> '1349'"; //1349号段属于电信
+    }
+    else if(corp=="CUTC") {
         where +=" and substr(seg,1,3) in ("+cutc+")";
-    else if(corp=="CTCC")
-        where +=" and substr(seg,1,3) in ("+ctcc+")";
-    else
+    }
+    else if(corp=="CTCC") {
+        //where +=" and substr(seg,1,3) in ("+ctcc+")";
+        where +=" and (substr(seg,1,3) in ("+ctcc+") or substr(seg,1,4) = '1349')";   //1349号段属于电信
+    }
+    else {
         where +=" and 0>1 ";
+    }
+
     QSqlQuery query;
     query.exec("select seg from num.mseg " + where + "  order by seg asc ");
     QStringList list;
@@ -1281,15 +1289,23 @@ QStringList SNCDataBase::getSegmentDynamic(QString city, QString corp, int days)
     cmcc = getCMCC();
     cutc = getCUTC();
     ctcc = getCTCC();
-    if(corp=="CMCC")
+
+    if(corp=="CMCC") {
         where +=" and substr(a.seg,1,3) in ("+cmcc+")";
-    else if(corp=="CUTC")
+        where +=" and substr(a.seg,1,4) <> '1349'"; //1349号段属于电信
+    }
+    else if(corp=="CUTC") {
         where +=" and substr(a.seg,1,3) in ("+cutc+")";
-    else if(corp=="CTCC")
-        where +=" and substr(a.seg,1,3) in ("+ctcc+")";
-    else
+    }
+    else if(corp=="CTCC") {
+        //where +=" and substr(a.seg,1,3) in ("+ctcc+")";
+        where +=" and (substr(a.seg,1,3) in ("+ctcc+") or substr(a.seg,1,4) = '1349')";   //1349号段属于电信
+    }
+    else {
         where +=" and 1>0 ";
+    }
     where += " and b.check_day<" + QString::number(days);
+
     QSqlQuery query;
     query.exec("select a.seg,b.s1,b.s2,b.s3,b.s4,b.sample_index,b.recommend_index,b.check_day from num.mseg a LEFT JOIN seg_dynamic b on a.seg = b.seg " + where + " ");
     QSqlRecord rec = query.record();
@@ -1354,17 +1370,25 @@ QStringList SNCDataBase::getSegmentDynamicByCityAndCorp(QString city, QString co
     //cmcc = "'134','135','136','137','138','139','147','150','151','152','154','157','158','159','182','183','187','188'";
     //cutc = "'130','131','132','145','155','156','185','186'";
     //ctcc = "'133','153','180','189'";
-    cmcc = getCMCC();
-    cutc = getCUTC();
-    ctcc = getCTCC();
-    if(corp=="CMCC")
+    cmcc = getCMCC();   //移动
+    cutc = getCUTC();   //联通
+    ctcc = getCTCC();   //电信
+
+    if(corp=="CMCC") {
         where +=" and substr(a.seg,1,3) in ("+cmcc+")";
-    else if(corp=="CUTC")
+        where +=" and substr(a.seg,1,4) <> '1349'"; //1349号段属于电信
+    }
+    else if(corp=="CUTC") {
         where +=" and substr(a.seg,1,3) in ("+cutc+")";
-    else if(corp=="CTCC")
-        where +=" and substr(a.seg,1,3) in ("+ctcc+")";
-    else
+    }
+    else if(corp=="CTCC") {
+        //where +=" and substr(a.seg,1,3) in ("+ctcc+")";
+        where +=" and (substr(a.seg,1,3) in ("+ctcc+") or substr(a.seg,1,4) = '1349')";   //1349号段属于电信
+    }
+    else {
         where +=" and 0>1 ";
+    }
+
     QSqlQuery query;
     query.exec("select a.seg,b.s1,b.s2,b.s3,b.s4,b.sample_index,b.recommend_index,b.check_day from num.mseg a LEFT JOIN seg_dynamic b on a.seg = b.seg " + where + " ");
     QSqlRecord rec = query.record();

sncprojects/lib/SNCDataBase/zxshdb.cpp

@@ -346,18 +346,34 @@ QStringList ZxshDB::getShkjZxshSegRealPnum(int updatedays, QString corp, QString
     cmcc = SNCDataBase::getCMCC();
     cutc = SNCDataBase::getCUTC();
     ctcc = SNCDataBase::getCTCC();
-    if(corp=="1")
+
+    QString where = "";
+    if(corp=="1") {
+        where +=" and substr(a.seg,1,3) in ("+cmcc+")";
+        where +=" and substr(a.seg,1,4) <> '1349'"; //1349号段属于电信
+    }
+    else if(corp=="2") {
+        where +=" and substr(a.seg,1,3) in ("+cutc+")";
+    }
+    else if(corp=="3") {
+         where +=" and (substr(a.seg,1,3) in ("+ctcc+") or substr(a.seg,1,4) = '1349')";   //1349号段属于电信
+    }
+    else {
+        where +="";
+    }
+
+    /*if(corp=="1")
         isp = cmcc;
     else if(corp=="2")
         isp = cutc;
     else if(corp=="3")
         isp = ctcc;
     else
-        isp = cmcc+","+cutc+","+ctcc;
+        isp = cmcc+","+cutc+","+ctcc;*/
     QSqlQuery query;
     QString sql = "select a.seg,b.s1,b.s2,b.s3,b.s4,b.s5,b.s6,b.s7,b.s8,b.s9,b.s10 \
             from num.mseg a LEFT JOIN SEG_RealNum_tmp b \
-            on a.seg = b.seg where a.city = ? and  substr(b.seg,1,3) in ("+isp+")";
+            on a.seg = b.seg where a.city = ? " + where;    // and  substr(b.seg,1,3) in ("+isp+")";
 
     if(updatedays==1)
         sql += " and b.s1>0";

sncprojects/sncprojects.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by Qt Creator 2.6.1, 2019-04-23T19:09:07. -->
+<!-- Written by Qt Creator 2.6.1, 2019-06-03T15:29:52. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>