24 hr transit visa arriving at Shanghai airport, leaving on cruise ship

U.S. citizen flying from Hong Kong to Shanghai airport, staying less than 24 hours, then leaving Shanghai port on cruise ship, disembarking in Hong Kong, and then flying back to U.S. Will a 24 hour transit visa work for this scenario?