Paris - Shanghai - Tokyo - Taipei - Shanghai - Paris

Hi, I'm taking off Paris on 11/09 and landing in Shanghai on 12/09 at 5:35 am. I take off Shanghai on 18/09 at 7:30 pm to go to Tokyo(144 hours visa-free should apply given that it starts at 0h for the next day we land in Shanghai, that is 13/09).
Then I come back to Shanghai on 30/09 at 2:30 pm at Hongqiao airport to take an other plane at Pudong airport the same day at 8pm for Paris. Will the 144 hours free still be available for me even though I would have been in Shanghai 2 weeks before ?