Eligible for the 144 hour free transit in Shanghai?

1. We are 2 german citizens coming from Manila, Philippines, on October 5 and arriving at Shanghai airport at 11;45 pm. We booked a hotel in Shanghai till october 9 and will then join a Cruise ship departing at 7pm that same October 9 going to Busuan, Korea. Are we eligible for the 144 hour free transit in Shanghai?

2. On the same ship coming from Japan we will be in Shanghai again for 1 day on October 23 from 6am to 10am, but that ship goes first back again to a Japan city then to Taipeh and Hong Kong. Do we need a visa for this 1 day?