It seems like these two will be at odds with one another forever, regardless of the current state of politics in India. While the far right/BJP's grip on power is waning and won't last forever, it does feel like neither China nor India will move forward with significant collaboration. China has effectively built its Belt Road all the way around the country.
This is of tremendous detriment to India, literally the most populous country on the planet, because it knows the USA is an unreliable partner and its only real ally is Russia, with whom they can't even trade energy with due to geographical constraints.
Moving forward, what is China's plan with India? Is there any intention to smoothen these relations?
It's a massively complex subject, lots of good in their relationship, lots of bad.
China is India's biggest import partner by far, they're dependent on the trade: https://en.wikipedia.org/wiki/List_of_largest_trading_partners_of_India