piřdání cesty k informaci o licenci
This commit is contained in:
@@ -27,6 +27,7 @@ struct InitStructure
|
|||||||
struct LicenceInfo
|
struct LicenceInfo
|
||||||
{
|
{
|
||||||
string licenceFileName = "";
|
string licenceFileName = "";
|
||||||
|
string licenceFilePath = "";
|
||||||
};
|
};
|
||||||
|
|
||||||
class LicenceReader
|
class LicenceReader
|
||||||
|
|||||||
Binary file not shown.
@@ -9,7 +9,7 @@
|
|||||||
/// @param argc
|
/// @param argc
|
||||||
/// @param argv parametry pro generování licence
|
/// @param argv parametry pro generování licence
|
||||||
/// @return
|
/// @return
|
||||||
int main7(int argc, char *argv[])
|
int main9(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
unordered_map<string, string> arguments = getArguments(argc, argv);
|
unordered_map<string, string> arguments = getArguments(argc, argv);
|
||||||
try
|
try
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ int main()
|
|||||||
initStructure.licenceType = (int)LicenceType::DRT;
|
initStructure.licenceType = (int)LicenceType::DRT;
|
||||||
initStructure.licenceVersion = 1;
|
initStructure.licenceVersion = 1;
|
||||||
initStructure.licenceIndex = 0;
|
initStructure.licenceIndex = 0;
|
||||||
initStructure.licenceFilePath = ""; // cesta k licenčnímu souboru
|
initStructure.licenceFilePath = "c://_projects//sd_gen//output//"; // cesta k licenčnímu souboru
|
||||||
// initStructure.compatibility = 0; v případě kompatibility 0 či nezadané je výstup defaultní.
|
// initStructure.compatibility = 0; v případě kompatibility 0 či nezadané je výstup defaultní.
|
||||||
// pro ELC 1 LicenceELC1Info je to isValid, pro ELC 2 strukura { int protocolId = -1; int dataPointsCount = 0; }
|
// pro ELC 1 LicenceELC1Info je to isValid, pro ELC 2 strukura { int protocolId = -1; int dataPointsCount = 0; }
|
||||||
initStructure.cid_csd_filePath = ""; // cesta k cidu/csd pro načtení a kontrolu licence
|
initStructure.cid_csd_filePath = ""; // cesta k cidu/csd pro načtení a kontrolu licence
|
||||||
@@ -69,7 +69,7 @@ int main()
|
|||||||
cout << "oemID: " << licenceReaderELC2.sdCardInfo.oemID << "\n";
|
cout << "oemID: " << licenceReaderELC2.sdCardInfo.oemID << "\n";
|
||||||
|
|
||||||
cout << "název licenčního souboru: " << licenceReaderELC2.licInfo.licenceFileName << "\n";
|
cout << "název licenčního souboru: " << licenceReaderELC2.licInfo.licenceFileName << "\n";
|
||||||
|
cout << "cesta k licenčnímu souboru: " << licenceReaderELC2.licInfo.licenceFilePath << "\n";
|
||||||
|
|
||||||
|
|
||||||
// if (initStructure.compatibility == 1) //ukazka kompatibilita 1
|
// if (initStructure.compatibility == 1) //ukazka kompatibilita 1
|
||||||
@@ -129,6 +129,9 @@ int main()
|
|||||||
{
|
{
|
||||||
cout << "Obecna chyba\n";
|
cout << "Obecna chyba\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
system("pause");
|
||||||
|
|
||||||
return SUCCES;
|
return SUCCES;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -101,6 +101,7 @@ bool LicenceReader::initread(int elcType, InitStructure &initStructure)
|
|||||||
this->sdCardInfo.oemID = this->licence2->sdCard.cardData.oemID;
|
this->sdCardInfo.oemID = this->licence2->sdCard.cardData.oemID;
|
||||||
|
|
||||||
this->licInfo.licenceFileName = this->licence2->licFileName;
|
this->licInfo.licenceFileName = this->licence2->licFileName;
|
||||||
|
this->licInfo.licenceFilePath = this->licence2->licenceFilePath;
|
||||||
|
|
||||||
//this->licenceInfo.
|
//this->licenceInfo.
|
||||||
//this->sdCardInfo.licenceFileName = this->licence2->licFileName;
|
//this->sdCardInfo.licenceFileName = this->licence2->licFileName;
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ namespace Reader
|
|||||||
string licFilePath = this->licenceFilePath + licFileName;
|
string licFilePath = this->licenceFilePath + licFileName;
|
||||||
|
|
||||||
this->licFileName = licFileName;
|
this->licFileName = licFileName;
|
||||||
|
this->licenceFilePath = licFilePath;
|
||||||
|
|
||||||
vector<char> content {};
|
vector<char> content {};
|
||||||
if (readFile(licFilePath, content) == false)
|
if (readFile(licFilePath, content) == false)
|
||||||
|
|||||||
Reference in New Issue
Block a user