Most of Shanghai has ended virus spread, 1M left in lockdown