Of course you're entering China from HK if you passed immigration in HK. But that is irrelevant, you got a Thai passport and that's what China Immigration are looking at, not where you originated from
not true you just login to free airport wifi in BKK airport, and no phone number is needed . Yes it lasts one hour, and to takes 2 mins to submit an online submission.