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

1、使用新的渠道打包方案，将渠道值写入到已经签名的apk上面，具体参考README.md

Browse Source 
2、将各种第三方工具使用的appid、key和渠道值改成用gradle.properties的配置方式
This commit is contained in:
CsHeng
2017-05-12 15:46:46 +08:00
parent b280e1bf89
commit 5eb5f6807e
25 changed files with 462 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/gh/gamecenter/MainActivity.java
View File

@ -12,13 +12,11 @@ import android.support.v4.app.FragmentTransaction;
import android.support.v4.content.ContextCompat;
import android.support.v4.util.ArrayMap;
import android.text.*;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.*;
import com.gh.base.BaseActivity;
import com.gh.base.SearchBarHint;
import com.gh.base.*;
import com.gh.common.constant.Config;
import com.gh.common.util.*;
import com.gh.download.*;
@ -383,8 +381,6 @@ public class MainActivity extends BaseActivity implements OnClickListener {
// 执行跳转事件
handler.postDelayed(skipRun, 500);
Log.e("TD_CHANNEL_ID", (String) PackageUtils.getMetaData(this, getPackageName(), "TD_CHANNEL_ID"));
if (sp.getBoolean("changeDefaultIcon", false) && sp.getInt("default_user_icon", 0) != 0) {
postDefaultIcon(true, sp.getInt("default_user_icon", 0), 1);
}
@ -569,9 +565,9 @@ public class MainActivity extends BaseActivity implements OnClickListener {
final String versionCode = PackageUtils.getVersionCode(MainActivity.this);
final String versionName = PackageUtils.getVersionName(MainActivity.this);
final String TD_CHANNEL_ID = (String) PackageUtils.getMetaData(MainActivity.this, getPackageName(), "TD_CHANNEL_ID");
final String packageChannel = AppController.getInstance().getChannel();
if ((TextUtils.isEmpty(version_code) || TextUtils.isEmpty(version_name) || TextUtils.isEmpty(channel))
|| (!version_code.equals(versionCode) || !version_name.equals(versionName) || !channel.equals(TD_CHANNEL_ID))) {
|| (!version_code.equals(versionCode) || !version_name.equals(versionName) || !channel.equals(packageChannel))) {
TokenUtils.getToken(MainActivity.this, true)
.flatMap(new Func1<String, Observable<ResponseBody>>() {
@Override
@ -579,7 +575,7 @@ public class MainActivity extends BaseActivity implements OnClickListener {
Map<String, String> params = new ArrayMap<>();
params.put("version_code", versionCode);
params.put("version_name", versionName);
params.put("channel", TD_CHANNEL_ID);
params.put("channel", packageChannel);
RequestBody body = RequestBody.create(MediaType.parse("application/json"),
new JSONObject(params).toString());
return RetrofitManager.getUser().postGhzs(token, body);
@ -592,7 +588,7 @@ public class MainActivity extends BaseActivity implements OnClickListener {
SharedPreferences.Editor editor = sp.edit();
editor.putString("version_code", versionCode);
editor.putString("version_name", versionName);
editor.putString("channel", TD_CHANNEL_ID);
editor.putString("channel", packageChannel);
editor.apply();
}
});