@@ -633,26 +633,34 @@ bool ContentAppFactoryImpl::UninstallContentApp(uint16_t vendorId, uint16_t prod
633
633
return false ;
634
634
}
635
635
636
+ std::string createSearchIndex (uint16_t vendorId, uint16_t productId) {
637
+ // Format the IDs into a string
638
+ std::string formattedString = std::to_string (vendorId) + " :" + std::to_string (productId);
639
+ return formattedString;
640
+ }
641
+
636
642
void ContentAppFactoryImpl::SetAppInstallationStatus (uint16_t vendorId, uint16_t productId, CommissionerDeclaration::CdError status)
637
643
{
638
- std::map<uint16_t , Protocols::UserDirectedCommissioning::CommissionerDeclaration::CdError>::iterator it;
639
- it = mAppInstallationStatus .find (vendorId);
644
+ std::string searchIndex = createSearchIndex (vendorId, productId);
645
+ std::map<std::string, Protocols::UserDirectedCommissioning::CommissionerDeclaration::CdError>::iterator it;
646
+ it = mAppInstallationStatus .find (searchIndex);
640
647
if (it != mAppInstallationStatus .end ())
641
648
{
642
- mAppInstallationStatus [vendorId ] = status;
649
+ mAppInstallationStatus [searchIndex ] = status;
643
650
return ;
644
651
}
645
652
646
- mAppInstallationStatus .insert ({ vendorId , status });
653
+ mAppInstallationStatus .insert ({ searchIndex , status });
647
654
}
648
655
649
656
CommissionerDeclaration::CdError ContentAppFactoryImpl::GetAppInstallationStatus (uint16_t vendorId, uint16_t productId)
650
657
{
651
- std::map<uint16_t , Protocols::UserDirectedCommissioning::CommissionerDeclaration::CdError>::iterator it;
652
- it = mAppInstallationStatus .find (vendorId);
658
+ std::string searchIndex = createSearchIndex (vendorId, productId);
659
+ std::map<std::string, Protocols::UserDirectedCommissioning::CommissionerDeclaration::CdError>::iterator it;
660
+ it = mAppInstallationStatus .find (searchIndex);
653
661
if (it != mAppInstallationStatus .end ())
654
662
{
655
- return mAppInstallationStatus [vendorId ];
663
+ return mAppInstallationStatus [searchIndex ];
656
664
}
657
665
658
666
return CommissionerDeclaration::CdError::kAppInstallConsentPending ;
@@ -715,7 +723,7 @@ CHIP_ERROR AppTvInit()
715
723
ContentAppPlatform::GetInstance ().SetupAppPlatform ();
716
724
ContentAppPlatform::GetInstance ().SetContentAppFactory (&gFactory );
717
725
gFactory .InstallContentApp ((uint16_t ) 1 , (uint16_t ) 11 );
718
- gFactory .InstallContentApp ((uint16_t ) 65521 , (uint16_t ) 32768 );
726
+ gFactory .InstallContentApp ((uint16_t ) 65521 , (uint16_t ) 32769 );
719
727
gFactory .InstallContentApp ((uint16_t ) 9050 , (uint16_t ) 22 );
720
728
gFactory .InstallContentApp ((uint16_t ) 1111 , (uint16_t ) 22 );
721
729
uint16_t value;
0 commit comments