Merge remote-tracking branch 'origin/dev' into dev-5.13.0

# Conflicts:
#	app/src/main/java/com/gh/common/util/DetailDownloadUtils.java
#	app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityFragment.kt
#	app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt
#	app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt
This commit is contained in:
chenjuntao
2022-08-17 15:57:56 +08:00
28 changed files with 473 additions and 143 deletions

View File

@ -161,8 +161,8 @@ public class DataUtils {
values.put(GhContentProvider.KEY_IS_ADULT, false);
}
new GhContentProvider().localInsert( HaloApp.getInstance().getApplication(),values);
// HaloApp.getInstance().getContentResolver().insert(Uri.parse("content://com.gh.gamecenter.provider/certification"), values);
// new GhContentProvider().localInsert( HaloApp.getInstance().getApplication(),values);
HaloApp.getInstance().getContentResolver().insert(Uri.parse("content://com.gh.gamecenter.provider/certification"), values);
}
});
}