|
@@ -35,6 +35,7 @@ import com.github.pengrad.mapscaleview.MapScaleView
|
|
|
import com.google.android.gms.maps.GoogleMap
|
|
|
import com.google.android.gms.maps.OnMapReadyCallback
|
|
|
import com.google.android.gms.maps.model.CameraPosition
|
|
|
+import com.google.gson.Gson
|
|
|
import com.sikey.veryfit.R
|
|
|
import com.sikey.veryfit.app.DataManager
|
|
|
import com.sikey.veryfit.component.VersionMatch.VersionMatch
|
|
@@ -1124,8 +1125,22 @@ class LocationFragment : Fragment(), ICurrentChildObserver, View.OnClickListener
|
|
|
|
|
|
private fun jumpToChat() {
|
|
|
if (VersionMatch.checkUiShow()) {
|
|
|
- val intent = Intent(context, PrivateTalkActivity::class.java)
|
|
|
- context?.startActivity(intent)
|
|
|
+ lifecycleScope.launch {
|
|
|
+ (activity as BaseNoActionBarActivity).showProgressDialog()
|
|
|
+ ChatMenuFragment.getInstance().initData().let{ list ->
|
|
|
+ (activity as BaseNoActionBarActivity).hideProgressDialog()
|
|
|
+ if(list == null) return@launch
|
|
|
+ val chatInfo = list.find {
|
|
|
+ it.ownerCid == DataManager.instance.currentChildInfo?.childId &&
|
|
|
+ it.type == UrlConstants.CHAT_TYPE_121
|
|
|
+ }?:return@launch
|
|
|
+ val infoStr = Gson().toJson(chatInfo)
|
|
|
+ val intent = Intent(context, PrivateTalkActivity::class.java)
|
|
|
+ intent.putExtra("chatInfo", infoStr)
|
|
|
+ context?.startActivity(intent)
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
} else {
|
|
|
val intent = Intent(context, FamilyTalkActivity::class.java)
|
|
|
context?.startActivity(intent)
|