Single visa & then 24 hour exemption on return trip?

Will arrive for 7 night china tour, and realise need for single visa. Then cruise from Shanghai to Japan. When cruise returns to Shanghai will be connecting to airport for flight to Hong Kong, same day. Will a 24 hour stopover free transit be alright for that section of our journey?