Are we meeting the requirements of the 144 hour visa-free transit

We are U.S. citizens holding a passport and will fly into Shanghai and spend 3 days touring within the restricted area, but we are not flying out of Shanghai, but rather boarding a cruise ship that heads first to Japan, then to several other countries before we port in Hong Kong. We spend 2 days days in port before flying back to the States. Are We OK?