Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 处理合并冲突

Browse Source
This commit is contained in:
liuyirong
2022-08-17 10:42:39 +08:00
parent bba8261d97
commit b4d44d6e0a
36 changed files with 695 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/java/com/gh/common/util/LogUtils.java
View File

@ -25,7 +25,6 @@ import com.gh.gamecenter.entity.PackageDialogEntity;
import com.gh.gamecenter.entity.SpecialColumn;
import com.gh.gamecenter.entity.StartupAdEntity;
import com.gh.gamecenter.login.user.UserManager;
import com.gh.gamecenter.manager.CommunityManager;
import com.gh.gamecenter.qa.entity.Questions;
import com.halo.assistant.HaloApp;
import com.lightgame.utils.Utils;
@ -159,37 +158,6 @@ public class LogUtils {
uploadToCommunity(object);
}
public static void uploadSearch(String searchKey) {
if (TextUtils.isEmpty(searchKey)) return;
JSONObject object = new JSONObject();
try {
object.put("community_id", CommunityManager.getInstance().getCommunity().getId());
object.put("community_name", CommunityManager.getInstance().getCommunity().getName());
object.put("keyword", searchKey);
object.put("subject", "search");
} catch (JSONException e) {
e.printStackTrace();
}
uploadToCommunity(object);
}
public static void communityRefresh(int dataCount, boolean manualRefresh) {
JSONObject object = new JSONObject();
try {
object.put("subject", "community_refresh");
object.put("community_id", CommunityManager.getInstance().getCommunity().getId());
object.put("refresh_type", "recommend");
object.put("refresh_way", manualRefresh ? "manual" : "auto");
object.put("data_count", dataCount);
} catch (JSONException e) {
e.printStackTrace();
}
uploadToCommunity(object);
}
public static void login(String loginStep, String loginType, String entrance) {
JSONObject object = new JSONObject();
try {