U3DRepository.git

parent: 89efb6a3 | 补丁 | 提交 | show whitespace

Merge commit 'e48629bda8952502013db4dec2cccd7ca7308783'

MacBuilder

2018-08-28 6f5a7b2cf52e2816d664ddaa14dc76b5c2d5d0a3

Merge commit 'e48629bda8952502013db4dec2cccd7ca7308783'

10个文件已修改

	Android/release/libs/freesdk-release.aar	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ChannelDiff/226114725/libs/app-game_226114725-release.aar	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ChannelDiff/813015059/AndroidManifest.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ChannelDiff/813015059/libs/app-game_813015059-release.aar	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ChannelDiff/815035853/libs/app-game_815035853-release.aar	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ChannelDiff/822055139/libs/app-game_822055139-release.aar	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Project/app/build.gradle	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Project/app/src/main/java/com/secondworld/univeralsdk/H2EngineSDK.java	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SDK相关/自由SDK/FreeSDK_ANDROID/freesdk-release.aar	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	渠道列表.xlsx	补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Android/release/libs/freesdk-release.aar

Binary files differ

 ChannelDiff/226114725/libs/app-game_226114725-release.aar

Binary files differ

 ChannelDiff/813015059/AndroidManifest.xml

@@ -239,7 +239,7 @@
        <!-- Required. AppKey copied from Portal -->
        <meta-data
            android:name="JPUSH_APPKEY"
            android:value="a0d746ccb32b9b0e5ce7c7be" />
            android:value="63f9523bf41727aaccfd258f" />
    </application>

</manifest>

 ChannelDiff/813015059/libs/app-game_813015059-release.aar

Binary files differ

 ChannelDiff/815035853/libs/app-game_815035853-release.aar

Binary files differ

 ChannelDiff/822055139/libs/app-game_822055139-release.aar

Binary files differ

 Project/app/build.gradle

@@ -61,7 +61,7 @@
            manifestPlaceholders.put("FreeSDK_PlatformID", "1000")
            manifestPlaceholders.put("TrackAppID", "0c5ad863fb8935d18b3ecefe05389701")
            manifestPlaceholders.put("TrackChannelID", "_default_")
            manifestPlaceholders.put("JpushAppKey", "a0d746ccb32b9b0e5ce7c7be")
            manifestPlaceholders.put("JpushAppKey", "63f9523bf41727aaccfd258f")
            manifestPlaceholders.put("TT_AppName", "å°å¹´ä¿®ä»ä¼ ")
            manifestPlaceholders.put("TT_AppID", "151709")
            manifestPlaceholders.put("TT_Chanel", "android-snxxz")

 Project/app/src/main/java/com/secondworld/univeralsdk/H2EngineSDK.java

@@ -198,22 +198,22 @@
        {
            Intent _intent = new Intent(Intent.ACTION_VIEW);

            if (Build.VERSION.SDK_INT >= 23)
            {
                _intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
                Uri _contentUri = FileProvider.getUriForFile(activity,
                                                             "com.shandangceshi.snxxz.fileProvider",
                                                             _file);
                _intent.setDataAndType(_contentUri, "application/vnd.android.package-archive");

            }
            else
            {
//            if (Build.VERSION.SDK_INT >= 23)
//            {
//                _intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
//                Uri _contentUri = FileProvider.getUriForFile(activity,
//                                                             "com.shandangceshi.snxxz.fileProvider",
//                                                             _file);
//                _intent.setDataAndType(_contentUri, "application/vnd.android.package-archive");
//
//            }
//            else
//            {
                _intent.setDataAndType(Uri.fromFile(_file),
                                       "application/vnd.android.package-archive");
                _intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

            }
//            }

            activity.startActivity(_intent);


 SDKÏà¹Ø/×ÔÓÉSDK/FreeSDK_ANDROID/freesdk-release.aar

Binary files differ

 ÇþµÀÁÐ±í.xlsx

Binary files differ

			@@ -239,7 +239,7 @@
			<!-- Required. AppKey copied from Portal -->
			<meta-data
			android:name="JPUSH_APPKEY"
			android:value="a0d746ccb32b9b0e5ce7c7be" />
			android:value="63f9523bf41727aaccfd258f" />
			</application>

			</manifest>

			@@ -61,7 +61,7 @@
			manifestPlaceholders.put("FreeSDK_PlatformID", "1000")
			manifestPlaceholders.put("TrackAppID", "0c5ad863fb8935d18b3ecefe05389701")
			manifestPlaceholders.put("TrackChannelID", "_default_")
			manifestPlaceholders.put("JpushAppKey", "a0d746ccb32b9b0e5ce7c7be")
			manifestPlaceholders.put("JpushAppKey", "63f9523bf41727aaccfd258f")
			manifestPlaceholders.put("TT_AppName", "å°å¹´ä¿®ä»ä¼ ")
			manifestPlaceholders.put("TT_AppID", "151709")
			manifestPlaceholders.put("TT_Chanel", "android-snxxz")

			@@ -198,22 +198,22 @@
			{
			Intent _intent = new Intent(Intent.ACTION_VIEW);

			if (Build.VERSION.SDK_INT >= 23)
			{
			_intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
			Uri _contentUri = FileProvider.getUriForFile(activity,
			"com.shandangceshi.snxxz.fileProvider",
			_file);
			_intent.setDataAndType(_contentUri, "application/vnd.android.package-archive");

			}
			else
			{
			// if (Build.VERSION.SDK_INT >= 23)
			// {
			// _intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
			// Uri _contentUri = FileProvider.getUriForFile(activity,
			// "com.shandangceshi.snxxz.fileProvider",
			// _file);
			// _intent.setDataAndType(_contentUri, "application/vnd.android.package-archive");
			//
			// }
			// else
			// {
			_intent.setDataAndType(Uri.fromFile(_file),
			"application/vnd.android.package-archive");
			_intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

			}
			// }

			activity.startActivity(_intent);