24 hour and 144 hour china exemption visa eligibility

I was wondering if someone could help me, I am from the UK and have a flight booked from Dubai to Shanghai where I will stay for 2 nights. I will then aboard a cruise that's goes to Japan for 8 nights and will return to Shanghai where I have one night stay before my flight back to the UK with a connecting flight in Dubai. Will I be eligible for a 144 hour china twov for my first arrival into Shanghai and then a 24 hour twov for my second arrival into Shanghai after the cruise?
I hope this makes sense.