Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊

This commit is contained in:
zlzw 2023-10-28 09:49:06 +08:00
commit 479a7b8d33
2 changed files with 5 additions and 3 deletions

View File

@ -210,7 +210,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
} }
}); });
//loadData(); //loadData();
initPeopleNum(); //initPeopleNum();
} }
@Override @Override
@ -223,6 +223,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
loadData(); loadData();
initPeopleNum();
mPaused = false; mPaused = false;
} }

View File

@ -16,11 +16,12 @@ org.gradle.daemon=true
org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.parallel=true org.gradle.parallel=true
org.gradle.configureondemand=true org.gradle.configureondemand=true
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
systemProp.http.proxyHost=127.0.0.1 systemProp.http.proxyHost=127.0.0.1
systemProp.https.proxyHost=127.0.0.1 systemProp.https.proxyHost=127.0.0.1
systemProp.https.proxyPort=10809 systemProp.https.proxyPort=49957
systemProp.http.proxyPort=10809 systemProp.http.proxyPort=49957
#android.enableR8.fullMode=true #android.enableR8.fullMode=true