Is my visit visa free according to the new 24-hr transit policy?

I (an New Zealander) will arrive at Shanghai (only stopped at this port in China) from Japan on a cruise ship early in the morning. During that day I will tour around Shanghai (not other City) and then the cruise ship will depart Shanghai that evening heading for Taiwan.