Commit f1daf1da f1daf1da683f350c0bad37febb72a0082f0c8a94 by 金学艇

1.修改包名

1 parent b15bc319
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 2 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 package="com.topdraw.forfun" 3 package="com.topdraw.forfun_FJYD"
4 android:installLocation="auto"> 4 android:installLocation="auto">
5 5
6 <uses-feature android:glEsVersion="0x00020000" /> 6 <uses-feature android:glEsVersion="0x00020000" />
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
51 android:value="FJ.CMCC" /> 51 android:value="FJ.CMCC" />
52 <meta-data 52 <meta-data
53 android:name="TOPDRAW.PLATFORM_SERVER" 53 android:name="TOPDRAW.PLATFORM_SERVER"
54 android:value="http://forfun.fj.a183.ottcn.com" /> 54 android:value="http://forfun.fj.a183.ottcn.com:81/clutch" />
55 <meta-data 55 <meta-data
56 android:name="TOPDRAW.APPID" 56 android:name="TOPDRAW.APPID"
57 android:value="EastCity" /> 57 android:value="EastCity" />
......
...@@ -7,7 +7,7 @@ android { ...@@ -7,7 +7,7 @@ android {
7 buildToolsVersion PROP_BUILD_TOOLS_VERSION 7 buildToolsVersion PROP_BUILD_TOOLS_VERSION
8 8
9 defaultConfig { 9 defaultConfig {
10 applicationId "com.topdraw.forfun" 10 applicationId "com.topdraw.forfun_FJYD"
11 minSdkVersion PROP_MIN_SDK_VERSION 11 minSdkVersion PROP_MIN_SDK_VERSION
12 targetSdkVersion PROP_TARGET_SDK_VERSION 12 targetSdkVersion PROP_TARGET_SDK_VERSION
13 versionCode 2 13 versionCode 2
......
...@@ -63,8 +63,8 @@ import android.widget.TextView; ...@@ -63,8 +63,8 @@ import android.widget.TextView;
63 import android.widget.Toast; 63 import android.widget.Toast;
64 64
65 import com.knowyou_jni.single.SDKUtil; 65 import com.knowyou_jni.single.SDKUtil;
66 import com.topdraw.forfun.R;
67 66
67 import com.topdraw.forfun_FJYD.R;
68 import com.topdraw.sdk.ITopdrawResultListener; 68 import com.topdraw.sdk.ITopdrawResultListener;
69 import com.topdraw.sdk.ITopdrawSDK; 69 import com.topdraw.sdk.ITopdrawSDK;
70 import com.topdraw.sdk.TopdrawSDK; 70 import com.topdraw.sdk.TopdrawSDK;
...@@ -114,9 +114,6 @@ public class AppActivity extends Cocos2dxActivity { ...@@ -114,9 +114,6 @@ public class AppActivity extends Cocos2dxActivity {
114 114
115 initSdkData(); 115 initSdkData();
116 116
117 String token = getToken();
118 Log.d(TAG, "获取机顶盒的Token..." + token);
119
120 //----解决游戏页按返回退出时,背景图透明度过高,onPause和onResume中控制显示还是隐藏 117 //----解决游戏页按返回退出时,背景图透明度过高,onPause和onResume中控制显示还是隐藏
121 singleView = LayoutInflater.from(this).inflate(R.layout.activity_main_single_color, null); 118 singleView = LayoutInflater.from(this).inflate(R.layout.activity_main_single_color, null);
122 mRLSingleColor = singleView.findViewById(R.id.ll_single); 119 mRLSingleColor = singleView.findViewById(R.id.ll_single);
...@@ -174,25 +171,6 @@ public class AppActivity extends Cocos2dxActivity { ...@@ -174,25 +171,6 @@ public class AppActivity extends Cocos2dxActivity {
174 SDKWrapper.getInstance().init(this); 171 SDKWrapper.getInstance().init(this);
175 } 172 }
176 173
177 private String getToken() {
178 String value = "";
179 Uri uri = Uri.parse("content://stbconfig/authentication/user_token");
180 Cursor c = null;
181 try {
182 c = getContentResolver().query(uri, null, "name = ?", new String[]{"stb_device_name "}, null); // 建议使用这种name=?参数化的查询语句来操作
183 if (c != null && c.moveToFirst()) {
184 value = c.getString(c.getColumnIndex("value"));
185 }
186 } catch (Exception e) {
187 e.printStackTrace();
188 } finally {
189 if (c != null) {
190 c.close(); // 游标放到finally块来释放。
191 }
192 }
193 return value;
194 }
195
196 private void initSdkData() { 174 private void initSdkData() {
197 //init topdraw.jar----- 175 //init topdraw.jar-----
198 ApplicationInfo appInfo = null; 176 ApplicationInfo appInfo = null;
...@@ -420,6 +398,7 @@ public class AppActivity extends Cocos2dxActivity { ...@@ -420,6 +398,7 @@ public class AppActivity extends Cocos2dxActivity {
420 if (0 == result) { 398 if (0 == result) {
421 MelodyApplication.sdk = (ITopdrawSDK) obj; 399 MelodyApplication.sdk = (ITopdrawSDK) obj;
422 USER_ID = MelodyApplication.sdk.getOssUserID(); 400 USER_ID = MelodyApplication.sdk.getOssUserID();
401 Log.d(TAG, "获取token..." + MelodyApplication.sdk.getToken());
423 402
424 CookieManager.getInstance().setCookie(TOPDRAW_PLATFORM_SERVER, "appId=" + TOPDRAW_APPID); 403 CookieManager.getInstance().setCookie(TOPDRAW_PLATFORM_SERVER, "appId=" + TOPDRAW_APPID);
425 CookieManager.getInstance().setCookie(TOPDRAW_PLATFORM_SERVER, "userId=" + MelodyApplication.sdk.getUserID()); 404 CookieManager.getInstance().setCookie(TOPDRAW_PLATFORM_SERVER, "userId=" + MelodyApplication.sdk.getUserID());
...@@ -440,8 +419,9 @@ public class AppActivity extends Cocos2dxActivity { ...@@ -440,8 +419,9 @@ public class AppActivity extends Cocos2dxActivity {
440 SDKUtil.isOpenLog = true; 419 SDKUtil.isOpenLog = true;
441 int sdkResult = SDKUtil.getInstance().ky_initWithAppKey(AppActivity.this, APP_KEY, 420 int sdkResult = SDKUtil.getInstance().ky_initWithAppKey(AppActivity.this, APP_KEY,
442 getPackageManager().getPackageInfo(getPackageName(), 0).versionName); 421 getPackageManager().getPackageInfo(getPackageName(), 0).versionName);
443 Log.d(TAG,"sdkResult..."+sdkResult); 422 Log.d(TAG, "sdkResult..." + sdkResult);
444 baminSDKInited = (sdkResult == 0); 423 baminSDKInited = (sdkResult == 0);
424 Log.d(TAG, "埋点数据:" + baminSDKInited);
445 Map<String, Object> params = new HashMap<>(); 425 Map<String, Object> params = new HashMap<>();
446 params.put("appId", TOPDRAW_APPID); 426 params.put("appId", TOPDRAW_APPID);
447 params.put("userId", MelodyApplication.sdk.getUserID()); 427 params.put("userId", MelodyApplication.sdk.getUserID());
......