Arriving in Shanghai from Vancouver via Hong Kong to board a cruise ship. Do we qualify

We are flying from Vancouver to Shanghai via Hong Kong (Cathy Pacific) with a two hour stop over. In Shanghai we will board a cruise ship travelling from Shanghai to Singapore. Is Hong Kong or Vancouver considered our point of entry into China? We are trying to determine if we qualify for the 24 hour free transit pass. The policy reads that there needs to be a third country and it is not clear if the stop in Hong Kong negates that fact.

Thank you CC