Two stops in China on flight from Vancouver to Nepal. Can I use transit visa

I am a Canadian and will be travelling to Kathmandu on China Eastern from Vancouver via Shanghai and Kunming. The stop in Shanghai is for 16 hours and the flight to Kathmandu only passes through Kunming with only a one hour stop and not leave the airport if we disembark. Will this create a problem with getting a 24 hour free transit? Total time with both stops would be less than 24 hours in China