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

完成3.6.6数据统计需求(MTA) https://gitlab.ghzs.com/pm/halo-app-issues/issues/579 的补充部分

Browse Source
This commit is contained in:
chenjuntao
2019-07-29 15:23:12 +08:00
parent 1460e8cad3
commit 2f89ba9707
8 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
View File

@ -27,6 +27,7 @@ import com.gh.common.util.DeviceUtils;
import com.gh.common.util.DialogUtils;
import com.gh.common.util.GameRepositoryHelper;
import com.gh.common.util.GdtHelper;
import com.gh.common.util.MtaHelper;
import com.gh.common.util.PackageUtils;
import com.gh.common.util.PlatformUtils;
import com.gh.common.util.TagUtils;
@ -46,13 +47,11 @@ import org.jetbrains.annotations.NotNull;
import org.json.JSONObject;
import java.io.File;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import io.reactivex.Scheduler;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
import okhttp3.ResponseBody;
@ -72,7 +71,9 @@ public class SplashScreenActivity extends BaseActivity {
private boolean isNewFirstLaunch;
private final static int REQUEST_PERMISSION_TAG = 30001;
private String[] mPermissions = {Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE,
private String[] mPermissions = {
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.READ_PHONE_STATE};
public static Intent getSplashScreenIntent(Context context, Bundle bundle) {
@ -140,7 +141,7 @@ public class SplashScreenActivity extends BaseActivity {
public void onSuccess(ResponseBody data) {
try {
String content = new JSONObject(data.string()).getString("content");
DialogUtils.showPrivacyPolicyDialog(SplashScreenActivity.this,content);
DialogUtils.showPrivacyPolicyDialog(SplashScreenActivity.this, content);
} catch (Exception e) {
e.printStackTrace();
}
@ -148,7 +149,7 @@ public class SplashScreenActivity extends BaseActivity {
@Override
public void onFailure(@NotNull Exception exception) {
DialogUtils.showPrivacyPolicyDialog(SplashScreenActivity.this,null);
DialogUtils.showPrivacyPolicyDialog(SplashScreenActivity.this, null);
}
});
}
@ -252,6 +253,7 @@ public class SplashScreenActivity extends BaseActivity {
private void checkAndRequestPermission() {
if (EasyPermissions.hasPermissions(this, mPermissions)) {
launch();
MtaHelper.onEvent("授权情况", "启动授权", "都授权");
// 检查是否有旧版本光环，有就删掉
HaloApp.getInstance().getMainExecutor().execute(this::checkOldGhFile);
} else {
@ -268,11 +270,30 @@ public class SplashScreenActivity extends BaseActivity {
Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
intent.setData(Uri.parse("package:" + getPackageName()));
startActivity(intent);
}, this::launch);
}, () -> {
launch();
logGrantedPermission(perms);
});
} else {
DialogUtils.showPermissionDialog(this, "权限申请",
"在设置-应用-光环助手-权限中开启存储和手机信息权限，以保证能正常使用相关功能", "重试", "放弃",
this::checkAndRequestPermission, this::launch);
this::checkAndRequestPermission,
() -> {
launch();
logGrantedPermission(perms);
});
}
}
private void logGrantedPermission(List<String> perms) {
if (perms.size() == 1) {
MtaHelper.onEvent("授权情况", "启动授权", "只授权存储");
} else {
if (perms.contains(Manifest.permission.READ_PHONE_STATE)) {
MtaHelper.onEvent("授权情况", "启动授权", "都不授权");
} else {
MtaHelper.onEvent("授权情况", "启动授权", "只授权IMEI");
}
}
}