diff --git a/src/ir_reverser/.idea/sirius_code_robot.iml b/src/ir_reverser/.idea/irext_reverser.iml similarity index 93% rename from src/ir_reverser/.idea/sirius_code_robot.iml rename to src/ir_reverser/.idea/irext_reverser.iml index aeb6a4e..d3013a3 100644 --- a/src/ir_reverser/.idea/sirius_code_robot.iml +++ b/src/ir_reverser/.idea/irext_reverser.iml @@ -8,7 +8,7 @@ - + diff --git a/src/ir_reverser/.idea/misc.xml b/src/ir_reverser/.idea/misc.xml index e94a2eb..d32d56d 100644 --- a/src/ir_reverser/.idea/misc.xml +++ b/src/ir_reverser/.idea/misc.xml @@ -1,7 +1,4 @@ - - - - + \ No newline at end of file diff --git a/src/ir_reverser/.idea/modules.xml b/src/ir_reverser/.idea/modules.xml index d1a94ea..e10fb90 100644 --- a/src/ir_reverser/.idea/modules.xml +++ b/src/ir_reverser/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/src/ir_reverser/.idea/workspace.xml b/src/ir_reverser/.idea/workspace.xml index 909acb3..6ceb9b3 100644 --- a/src/ir_reverser/.idea/workspace.xml +++ b/src/ir_reverser/.idea/workspace.xml @@ -2,29 +2,28 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - + + @@ -44,7 +43,40 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + com.yuekong.sirius.ircoderobot + yuekong + ucon + UCON + yk + + + com.irext.reverser + irext + IREXT + + + D:\Project\Github_Work\irext\src\ir_reverser\src\com\irext\reverser + D:\Project\Github_Work\irext\src\ir_reverser + + @@ -92,6 +142,10 @@ @@ -114,8 +168,8 @@ @@ -134,16 +188,25 @@ - - - + + + + + + @@ -153,17 +216,48 @@ - - + + + + + + + + + + + + + + + + + @@ -176,6 +270,8 @@ + + @@ -190,6 +286,34 @@ + + + + + + + + + @@ -521,7 +651,7 @@ - + @@ -536,7 +666,7 @@ - - - - + + @@ -679,27 +810,27 @@ - + - + + - + - @@ -725,34 +856,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1034,6 +1137,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ir_reverser/src/META-INF/MANIFEST.MF b/src/ir_reverser/src/META-INF/MANIFEST.MF index f763f46..ed7e2fa 100644 --- a/src/ir_reverser/src/META-INF/MANIFEST.MF +++ b/src/ir_reverser/src/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ Manifest-Version: 1.0 -Main-Class: com.yuekong.sirius.ircoderobot.SiriusCodeRobot +Main-Class: com.irext.reverser.IRextReverser diff --git a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/SiriusCodeRobot.java b/src/ir_reverser/src/com/irext/reverser/IRextReverser.java similarity index 90% rename from src/ir_reverser/src/com/yuekong/sirius/ircoderobot/SiriusCodeRobot.java rename to src/ir_reverser/src/com/irext/reverser/IRextReverser.java index c015e6b..ad10bce 100644 --- a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/SiriusCodeRobot.java +++ b/src/ir_reverser/src/com/irext/reverser/IRextReverser.java @@ -1,16 +1,16 @@ /* * Created by strawmanbobi - * 2016-07-18 + * 2017-01-10 * - * Sirius IRDA code generating robot + * IR reverse engineering robot for IREXT */ -package com.yuekong.sirius.ircoderobot; +package com.irext.reverser; -import com.yuekong.sirius.ircoderobot.robot.RemoteEncoder; -import com.yuekong.sirius.ircoderobot.robot.RemoteIndexGenerator; +import com.irext.reverser.robot.RemoteEncoder; +import com.irext.reverser.robot.RemoteIndexGenerator; -public class SiriusCodeRobot { +public class IRextReverser { private final static int FUNCTION_GENERATE_REMOTE_INDEX = 0; private final static int FUNCTION_GENERATE_REMOTE_BINARY = 1; @@ -25,7 +25,7 @@ public class SiriusCodeRobot { case FUNCTION_GENERATE_REMOTE_INDEX: { if (7 != args.length) { System.out.println("invalid parameter"); - System.out.println("Please call this method like SiriusCodeRobot [function_code = 0] " + + System.out.println("Please call this method like IRextReverser [function_code = 0] " + "[source_xml_file_base] [ac_bin_file_base] [db_host] [db_name] [db_user] " + "[db_password]"); return; @@ -47,7 +47,7 @@ public class SiriusCodeRobot { case FUNCTION_GENERATE_REMOTE_BINARY: { if (10 != args.length) { System.out.println("invalid parameter"); - System.out.println("Please call this method like SiriusCodeRobot [function_code = 1] " + + System.out.println("Please call this method like IRextReverser [function_code = 1] " + "[source_xml_file_base] [output_xml_file_base] [encoder_python_file] " + "[encoder_python_base] [output_bin_file_base] [db_host] [db_name] [db_user] " + "[db_password]"); diff --git a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/Brand.java b/src/ir_reverser/src/com/irext/reverser/model/Brand.java similarity index 98% rename from src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/Brand.java rename to src/ir_reverser/src/com/irext/reverser/model/Brand.java index d47be6d..bc1a67e 100644 --- a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/Brand.java +++ b/src/ir_reverser/src/com/irext/reverser/model/Brand.java @@ -3,7 +3,7 @@ * 2016-07-18 */ -package com.yuekong.sirius.ircoderobot.model; +package com.irext.reverser.model; public class Brand { diff --git a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/BrandCategoryRel.java b/src/ir_reverser/src/com/irext/reverser/model/BrandCategoryRel.java similarity index 95% rename from src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/BrandCategoryRel.java rename to src/ir_reverser/src/com/irext/reverser/model/BrandCategoryRel.java index b4f12a7..2f561ff 100644 --- a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/BrandCategoryRel.java +++ b/src/ir_reverser/src/com/irext/reverser/model/BrandCategoryRel.java @@ -3,7 +3,7 @@ * 2016-07-18 */ -package com.yuekong.sirius.ircoderobot.model; +package com.irext.reverser.model; public class BrandCategoryRel { diff --git a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/BrandRemoteRel.java b/src/ir_reverser/src/com/irext/reverser/model/BrandRemoteRel.java similarity index 98% rename from src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/BrandRemoteRel.java rename to src/ir_reverser/src/com/irext/reverser/model/BrandRemoteRel.java index 1e714ab..7d94b36 100644 --- a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/BrandRemoteRel.java +++ b/src/ir_reverser/src/com/irext/reverser/model/BrandRemoteRel.java @@ -3,7 +3,7 @@ * 2015-07-18 */ -package com.yuekong.sirius.ircoderobot.model; +package com.irext.reverser.model; public class BrandRemoteRel { diff --git a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/Category.java b/src/ir_reverser/src/com/irext/reverser/model/Category.java similarity index 97% rename from src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/Category.java rename to src/ir_reverser/src/com/irext/reverser/model/Category.java index 6cc6248..04c6ce7 100644 --- a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/Category.java +++ b/src/ir_reverser/src/com/irext/reverser/model/Category.java @@ -3,7 +3,7 @@ * 2015-07-18 */ -package com.yuekong.sirius.ircoderobot.model; +package com.irext.reverser.model; public class Category { diff --git a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/City.java b/src/ir_reverser/src/com/irext/reverser/model/City.java similarity index 98% rename from src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/City.java rename to src/ir_reverser/src/com/irext/reverser/model/City.java index 42f4d7c..ce5f239 100644 --- a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/City.java +++ b/src/ir_reverser/src/com/irext/reverser/model/City.java @@ -3,7 +3,7 @@ * 2016-07-18 */ -package com.yuekong.sirius.ircoderobot.model; +package com.irext.reverser.model; public class City { diff --git a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/IPTV.java b/src/ir_reverser/src/com/irext/reverser/model/IPTV.java similarity index 96% rename from src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/IPTV.java rename to src/ir_reverser/src/com/irext/reverser/model/IPTV.java index b3511fc..fce7042 100644 --- a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/IPTV.java +++ b/src/ir_reverser/src/com/irext/reverser/model/IPTV.java @@ -3,7 +3,7 @@ * 2015-07-26 */ -package com.yuekong.sirius.ircoderobot.model; +package com.irext.reverser.model; import java.util.List; diff --git a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/KeyInstance.java b/src/ir_reverser/src/com/irext/reverser/model/KeyInstance.java similarity index 96% rename from src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/KeyInstance.java rename to src/ir_reverser/src/com/irext/reverser/model/KeyInstance.java index 42029a5..06a3892 100644 --- a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/KeyInstance.java +++ b/src/ir_reverser/src/com/irext/reverser/model/KeyInstance.java @@ -3,7 +3,7 @@ * 2016-08-05 */ -package com.yuekong.sirius.ircoderobot.model; +package com.irext.reverser.model; public class KeyInstance { diff --git a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/KeyTemplate.java b/src/ir_reverser/src/com/irext/reverser/model/KeyTemplate.java similarity index 97% rename from src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/KeyTemplate.java rename to src/ir_reverser/src/com/irext/reverser/model/KeyTemplate.java index 28bd581..4e5908c 100644 --- a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/KeyTemplate.java +++ b/src/ir_reverser/src/com/irext/reverser/model/KeyTemplate.java @@ -3,7 +3,7 @@ * 2016-07-18 */ -package com.yuekong.sirius.ircoderobot.model; +package com.irext.reverser.model; public class KeyTemplate { diff --git a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/Operator.java b/src/ir_reverser/src/com/irext/reverser/model/Operator.java similarity index 97% rename from src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/Operator.java rename to src/ir_reverser/src/com/irext/reverser/model/Operator.java index afec877..064bcf7 100644 --- a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/Operator.java +++ b/src/ir_reverser/src/com/irext/reverser/model/Operator.java @@ -3,7 +3,7 @@ * 2016-07-18 */ -package com.yuekong.sirius.ircoderobot.model; +package com.irext.reverser.model; public class Operator { diff --git a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/RemoteIndex.java b/src/ir_reverser/src/com/irext/reverser/model/RemoteIndex.java similarity index 98% rename from src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/RemoteIndex.java rename to src/ir_reverser/src/com/irext/reverser/model/RemoteIndex.java index d969488..ae135c6 100644 --- a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/RemoteIndex.java +++ b/src/ir_reverser/src/com/irext/reverser/model/RemoteIndex.java @@ -3,7 +3,7 @@ * 2016-07-20 */ -package com.yuekong.sirius.ircoderobot.model; +package com.irext.reverser.model; public class RemoteIndex { diff --git a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/RemoteInstance.java b/src/ir_reverser/src/com/irext/reverser/model/RemoteInstance.java similarity index 97% rename from src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/RemoteInstance.java rename to src/ir_reverser/src/com/irext/reverser/model/RemoteInstance.java index 028ff98..86b8984 100644 --- a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/RemoteInstance.java +++ b/src/ir_reverser/src/com/irext/reverser/model/RemoteInstance.java @@ -3,7 +3,7 @@ * 2016-08-05 */ -package com.yuekong.sirius.ircoderobot.model; +package com.irext.reverser.model; import java.util.List; diff --git a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/RemoteTemplate.java b/src/ir_reverser/src/com/irext/reverser/model/RemoteTemplate.java similarity index 97% rename from src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/RemoteTemplate.java rename to src/ir_reverser/src/com/irext/reverser/model/RemoteTemplate.java index 2034765..c0e2471 100644 --- a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/RemoteTemplate.java +++ b/src/ir_reverser/src/com/irext/reverser/model/RemoteTemplate.java @@ -3,7 +3,7 @@ * 2016-07-22 */ -package com.yuekong.sirius.ircoderobot.model; +package com.irext.reverser.model; import java.util.List; diff --git a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/SPStbRel.java b/src/ir_reverser/src/com/irext/reverser/model/SPStbRel.java similarity index 96% rename from src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/SPStbRel.java rename to src/ir_reverser/src/com/irext/reverser/model/SPStbRel.java index 9a3d14f..fb76eb6 100644 --- a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/model/SPStbRel.java +++ b/src/ir_reverser/src/com/irext/reverser/model/SPStbRel.java @@ -3,7 +3,7 @@ * 2015-07-20 */ -package com.yuekong.sirius.ircoderobot.model; +package com.irext.reverser.model; public class SPStbRel { diff --git a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/robot/RemoteEncoder.java b/src/ir_reverser/src/com/irext/reverser/robot/RemoteEncoder.java similarity index 94% rename from src/ir_reverser/src/com/yuekong/sirius/ircoderobot/robot/RemoteEncoder.java rename to src/ir_reverser/src/com/irext/reverser/robot/RemoteEncoder.java index 100a696..18c5652 100644 --- a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/robot/RemoteEncoder.java +++ b/src/ir_reverser/src/com/irext/reverser/robot/RemoteEncoder.java @@ -3,12 +3,12 @@ * 2016-08-01 */ -package com.yuekong.sirius.ircoderobot.robot; +package com.irext.reverser.robot; import com.mysql.jdbc.Connection; import com.mysql.jdbc.PreparedStatement; -import com.yuekong.sirius.ircoderobot.model.KeyInstance; -import com.yuekong.sirius.ircoderobot.model.RemoteInstance; +import com.irext.reverser.model.KeyInstance; +import com.irext.reverser.model.RemoteInstance; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -51,14 +51,14 @@ public class RemoteEncoder { private static final String NODE_REMOTE_KEY_ID = "id"; private static final String NODE_REMOTE_KEY_PULSE = "pulse"; - private static final String EX_NODE_UCON_DOCUMENT = "DOCUMENT"; - private static final String EX_NODE_UCON_REMOTE = "remote_controller"; - private static final String EX_NODE_UCON_ID = "id"; - private static final String EX_NODE_UCON_EXTS = "exts"; - private static final String EX_NODE_UCON_EXT = "ext"; - private static final String EX_NODE_UCON_TAG = "tag"; - private static final String EX_NODE_UCON_TAG_VALUE = "value"; - private static final String EX_NODE_UCON_TAG_TYPE = "type"; + private static final String EX_NODE_IREXT_DOCUMENT = "DOCUMENT"; + private static final String EX_NODE_IREXT_REMOTE = "remote_controller"; + private static final String EX_NODE_IREXT_ID = "id"; + private static final String EX_NODE_IREXT_EXTS = "exts"; + private static final String EX_NODE_IREXT_EXT = "ext"; + private static final String EX_NODE_IREXT_TAG = "tag"; + private static final String EX_NODE_IREXT_TAG_VALUE = "value"; + private static final String EX_NODE_IREXT_TAG_TYPE = "type"; // connection and data source base private String sourceXmlFileBasePath; @@ -205,29 +205,29 @@ public class RemoteEncoder { DocumentBuilder builder = factory.newDocumentBuilder(); Document remoteDocument = builder.newDocument(); remoteDocument.setXmlVersion("1.0"); - Element remoteRoot = remoteDocument.createElement(EX_NODE_UCON_DOCUMENT); + Element remoteRoot = remoteDocument.createElement(EX_NODE_IREXT_DOCUMENT); remoteDocument.appendChild(remoteRoot); - Element remoteControllerElement = remoteDocument.createElement(EX_NODE_UCON_REMOTE); + Element remoteControllerElement = remoteDocument.createElement(EX_NODE_IREXT_REMOTE); remoteRoot.appendChild(remoteControllerElement); - Element idElement = remoteDocument.createElement(EX_NODE_UCON_ID); + Element idElement = remoteDocument.createElement(EX_NODE_IREXT_ID); idElement.setTextContent(String.valueOf(remoteInstance.getmRemoteTemplateID())); remoteControllerElement.appendChild(idElement); - Element extsElement = remoteDocument.createElement(EX_NODE_UCON_EXTS); + Element extsElement = remoteDocument.createElement(EX_NODE_IREXT_EXTS); remoteControllerElement.appendChild(extsElement); List keyInstanceList = remoteInstance.getmKeyInstanceList(); if (null != keyInstanceList) { System.out.println("Will add " + keyInstanceList.size() + " keys to this remote"); for (KeyInstance keyInstance : keyInstanceList) { - Element extElement = remoteDocument.createElement(EX_NODE_UCON_EXT); - Element tagElement = remoteDocument.createElement(EX_NODE_UCON_TAG); + Element extElement = remoteDocument.createElement(EX_NODE_IREXT_EXT); + Element tagElement = remoteDocument.createElement(EX_NODE_IREXT_TAG); tagElement.setTextContent(String.valueOf(keyInstance.getmKeyTemplateID())); - Element tagValueElement = remoteDocument.createElement(EX_NODE_UCON_TAG_VALUE); + Element tagValueElement = remoteDocument.createElement(EX_NODE_IREXT_TAG_VALUE); tagValueElement.setTextContent(String.valueOf(keyInstance.getmKeyValue())); - Element tagTypeElement = remoteDocument.createElement(EX_NODE_UCON_TAG_TYPE); + Element tagTypeElement = remoteDocument.createElement(EX_NODE_IREXT_TAG_TYPE); tagTypeElement.setTextContent(String.valueOf(keyInstance.getmKeyType())); extElement.appendChild(tagElement); @@ -257,7 +257,7 @@ public class RemoteEncoder { ////////// step 5 - compress key-tag files into binary with dynamic python encoder ////////// // collect output files - // NOTE: skip step 5 for UCON SIRIUS + // NOTE: skip step 5 for IREXT SIRIUS /* System.out.println("collecting output xml files..."); getXMLSourceFiles(outputXmlFileBasePath); diff --git a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/robot/RemoteIndexGenerator.java b/src/ir_reverser/src/com/irext/reverser/robot/RemoteIndexGenerator.java similarity index 98% rename from src/ir_reverser/src/com/yuekong/sirius/ircoderobot/robot/RemoteIndexGenerator.java rename to src/ir_reverser/src/com/irext/reverser/robot/RemoteIndexGenerator.java index 5c9bfd9..ef51ad4 100644 --- a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/robot/RemoteIndexGenerator.java +++ b/src/ir_reverser/src/com/irext/reverser/robot/RemoteIndexGenerator.java @@ -3,12 +3,12 @@ * 2016-07-20 */ -package com.yuekong.sirius.ircoderobot.robot; +package com.irext.reverser.robot; import com.mysql.jdbc.Connection; import com.mysql.jdbc.PreparedStatement; import com.mysql.jdbc.ResultSet; -import com.yuekong.sirius.ircoderobot.model.*; +import com.irext.reverser.model.*; import org.w3c.dom.*; import javax.xml.parsers.DocumentBuilder; @@ -100,9 +100,9 @@ public class RemoteIndexGenerator { private static final String NODE_REMOTE_KEY_ID = "id"; private static final String NODE_REMOTE_KEY_PULSE = "pulse"; - // kookong-ucon cateogry mapping - // the index of array indicates kookong device type ID while the value of array indicates UCONs' - // NOTE: IPTV in UCON remote index system is separated from STB, so it should not be in this table + // kookong-irext cateogry mapping + // the index of array indicates kookong device type ID while the value of array indicates IREXTs' + // NOTE: IPTV in IREXT remote index system is separated from STB, so it should not be in this table private static final int[] catetoryMapping = { 3, // STB 5, // IPTV @@ -834,14 +834,14 @@ public class RemoteIndexGenerator { brandRemoteRel.getmKookongBrandID())) { // count this brand only if it hasn't been counted yet - int uconCategoryID = getUCONCategoryIDFromCategory(category.getmKookongCategoryID()); - String uconCategoryName = getUCONCategoryNameFromCategory(category.getmKookongCategoryID()); - System.out.println(uconCategoryID + ", " + uconCategoryName + ", " + + int irextCategoryID = getIREXTCategoryIDFromCategory(category.getmKookongCategoryID()); + String irextCategoryName = getIREXTCategoryNameFromCategory(category.getmKookongCategoryID()); + System.out.println(irextCategoryID + ", " + irextCategoryName + ", " + brand.getmBrandName() + ", rank = " + brandRemoteRel.getmPriority()); // insert this brand into brand table String sqlString = "SELECT * FROM brand WHERE brand_id = " + - "'" + brand.getmKookongBrandID() + "' AND category_id = '" + uconCategoryID + "';"; + "'" + brand.getmKookongBrandID() + "' AND category_id = '" + irextCategoryID + "';"; PreparedStatement statement = (PreparedStatement) mConnection.prepareStatement(sqlString); ResultSet resultSet = (ResultSet) statement.executeQuery(); if(resultSet.next()) { @@ -860,8 +860,8 @@ public class RemoteIndexGenerator { (PreparedStatement) mConnection.prepareStatement(innerSqlString); innerStatement.setInt(1, brand.getmKookongBrandID()); innerStatement.setString(2, brand.getmBrandName()); - innerStatement.setInt(3, uconCategoryID); - innerStatement.setString(4, uconCategoryName); + innerStatement.setInt(3, irextCategoryID); + innerStatement.setString(4, irextCategoryName); innerStatement.setInt(5, 1); innerStatement.setString(6, "2016-07-26 17:00:00"); innerStatement.setInt(7, brandRemoteRel.getmPriority()); @@ -912,7 +912,7 @@ public class RemoteIndexGenerator { int priority = spStbRel.getmPriority(); String appliedVersion = "V0.0.0"; String bannedVersion = "V99.0.0"; - String inputSource = "CodeRobot_V1.0@ucon"; + String inputSource = "CodeRobot_V1.0@irext"; String sqlString = "SELECT * FROM remote_index WHERE category_id = 3 AND city_code = '" + cityCode + "' AND operator_id = '" + operatorID + "' AND remote_template_id = '" + remoteTemplateID + "';"; @@ -985,9 +985,9 @@ public class RemoteIndexGenerator { int priority = (remoteIndexCountForIPTVperBrand + 1) * 10; String appliedVersion = "V0.0.0"; String bannedVersion = "V99.0.0"; - String inputSource = "CodeRobot_V1.0@ucon"; + String inputSource = "CodeRobot_V1.0@irext"; - // NOTE: brandID in remote_index table indicates the id of UCON brand + // NOTE: brandID in remote_index table indicates the id of IREXT brand String sqlString = "SELECT * FROM remote_index WHERE category_id = 5 AND brand_id = '" + brandID + "' AND remote_template_id = '" + remoteTemplateID + "';"; PreparedStatement statement = (PreparedStatement) mConnection.prepareStatement(sqlString); @@ -1054,12 +1054,12 @@ public class RemoteIndexGenerator { int remoteTemplateID = brandRemoteRel.getmKookongRemoteID(); if (5 == kookongCategoryID) { if (false == isInIntArray(mValidACIDList, remoteTemplateID, mValidACIDList.length)) { - System.out.println("This AC is invalid for UCON : " + remoteTemplateID); + System.out.println("This AC is invalid for IREXT : " + remoteTemplateID); continue; } } - int categoryID = getUCONCategoryIDFromCategory(kookongCategoryID); - String categoryName = getUCONCategoryNameFromCategory(kookongCategoryID); + int categoryID = getIREXTCategoryIDFromCategory(kookongCategoryID); + String categoryName = getIREXTCategoryNameFromCategory(kookongCategoryID); int kookongBrandID = brandRemoteRel.getmKookongBrandID(); String brandName = ""; int brandID = 0; @@ -1078,9 +1078,9 @@ public class RemoteIndexGenerator { int priority = brandRemoteRel.getmPriority(); String appliedVersion = "V0.0.0"; String bannedVersion = "V99.0.0"; - String inputSource = "CodeRobot_V1.0@ucon"; + String inputSource = "CodeRobot_V1.0@irext"; - // NOTE: brandID in remote_index table indicates the id of UCON brand + // NOTE: brandID in remote_index table indicates the id of IREXT brand String sqlString = "SELECT * FROM remote_index WHERE category_id = '" + categoryID +"'" + " AND brand_id = '" + brandID + "' AND remote_template_id = '" + remoteTemplateID + "';"; PreparedStatement statement = (PreparedStatement) mConnection.prepareStatement(sqlString); @@ -1263,7 +1263,7 @@ public class RemoteIndexGenerator { } } System.out.println(remoteIndexCount + " remote index found by category " + - getUCONCategoryNameFromCategory(categoryID)); + getIREXTCategoryNameFromCategory(categoryID)); // have some debug on key hits for (KeyTemplate keyTemplate : mKeyTemplateList) { @@ -1380,11 +1380,11 @@ public class RemoteIndexGenerator { return false; } - private int getUCONCategoryIDFromCategory(int kookongCategoryID) { + private int getIREXTCategoryIDFromCategory(int kookongCategoryID) { return catetoryMapping[kookongCategoryID]; } - private String getUCONCategoryNameFromCategory(int kookongCategoryID) { + private String getIREXTCategoryNameFromCategory(int kookongCategoryID) { return categoryNameMapping[kookongCategoryID]; } diff --git a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/utils/VeDate.java b/src/ir_reverser/src/com/irext/reverser/utils/VeDate.java similarity index 99% rename from src/ir_reverser/src/com/yuekong/sirius/ircoderobot/utils/VeDate.java rename to src/ir_reverser/src/com/irext/reverser/utils/VeDate.java index 9be0110..9379ce1 100644 --- a/src/ir_reverser/src/com/yuekong/sirius/ircoderobot/utils/VeDate.java +++ b/src/ir_reverser/src/com/irext/reverser/utils/VeDate.java @@ -2,7 +2,7 @@ * Created by Strawmanbobi on 2015-08-30. */ -package com.yuekong.sirius.ircoderobot.utils; +package com.irext.reverser.utils; import java.text.*; import java.util.Calendar;