24 and 144 hour visa transit rules

I am travelling on an Australian Passport to Shanghai Pudong Airport on Thursday 29th December arriving at 7.05am. I am then departing on a Royal Caribbean Cruise from Boashan at 5pm the same evening. Am I eligible for the ’24 hour free transit rule’?

In addition, I will return to Shanghai with the Royal Caribbean cruise into Boashan at 6am on Tuesday 3rd January, and not fly out of Shanghai Pudong Airport until 10pm Wednesday 4th January (the following day). Am I eligible for the ‘144 hour free transit’ rule?

Thank you for your assistance.