Showing
6 changed files
with
79 additions
and
129 deletions
| @@ -84,41 +84,17 @@ android { | @@ -84,41 +84,17 @@ android { | ||
| 84 | proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' | 84 | proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' |
| 85 | buildConfigField 'String', 'MACHINE_TYPE', "\"gimi\"" | 85 | buildConfigField 'String', 'MACHINE_TYPE', "\"gimi\"" |
| 86 | buildConfigField 'boolean', 'USE_GLIDE', "false" | 86 | buildConfigField 'boolean', 'USE_GLIDE', "false" |
| 87 | - manifestPlaceholders = [label: "方糖", icon: "@drawable/ic_launcher", channel: "QN"] | ||
| 88 | } | 87 | } |
| 89 | debug { | 88 | debug { |
| 90 | - buildConfigField 'String', 'DEFAULT_IP', "\"192.168.200.200\"" | ||
| 91 | -// buildConfigField 'String', 'MACHINE_TYPE', "\"himedia\""; | ||
| 92 | -// buildConfigField 'boolean', 'USE_GLIDE', "true"; | ||
| 93 | -// manifestPlaceholders = [label: "青柠影咖", icon: "@drawable/ic_luancher", channel: "QNJM"] | 89 | + buildConfigField 'String', 'DEFAULT_IP', "\"192.168.200.241\"" |
| 94 | buildConfigField 'String', 'MACHINE_TYPE', "\"gimi\"" | 90 | buildConfigField 'String', 'MACHINE_TYPE', "\"gimi\"" |
| 95 | buildConfigField 'boolean', 'USE_GLIDE', "false" | 91 | buildConfigField 'boolean', 'USE_GLIDE', "false" |
| 96 | - manifestPlaceholders = [label: "方糖", icon: "@drawable/ic_launcher", channel: "JSZC"] | ||
| 97 | - minifyEnabled false | ||
| 98 | signingConfig signingConfigs.myConfig | 92 | signingConfig signingConfigs.myConfig |
| 99 | proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' | 93 | proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' |
| 100 | jniDebuggable false | 94 | jniDebuggable false |
| 101 | } | 95 | } |
| 102 | } | 96 | } |
| 103 | productFlavors { | 97 | productFlavors { |
| 104 | -// ZaiXian { | ||
| 105 | -// buildConfigField 'String', 'MACHINE_TYPE', "\"gimi\"" | ||
| 106 | -// buildConfigField 'boolean', 'USE_GLIDE', "false" | ||
| 107 | -// manifestPlaceholders = [label: "在线影院", icon: "@drawable/ic_luancher_zx", channel: "JSZC"] | ||
| 108 | -// } | ||
| 109 | -// | ||
| 110 | -// QinNing { | ||
| 111 | -//// applicationId "com.qnbar.fangtang.cinema" | ||
| 112 | -// buildConfigField 'String', 'MACHINE_TYPE', "\"gimi\"" | ||
| 113 | -// buildConfigField 'boolean', 'USE_GLIDE', "false" | ||
| 114 | -// manifestPlaceholders = [label: "青柠影咖", icon: "@drawable/ic_luancher", channel: "QN"] | ||
| 115 | -// } | ||
| 116 | -// | ||
| 117 | -// Himedia { | ||
| 118 | -// buildConfigField 'String', 'MACHINE_TYPE', "\"himedia\""; | ||
| 119 | -// buildConfigField 'boolean', 'USE_GLIDE', "true"; | ||
| 120 | -// manifestPlaceholders = [label: "在线影院", icon: "@drawable/ic_luancher_zx", channel: "QN"] | ||
| 121 | -// } | ||
| 122 | } | 98 | } |
| 123 | 99 | ||
| 124 | applicationVariants.all { variant -> | 100 | applicationVariants.all { variant -> |
| @@ -165,7 +141,7 @@ dependencies { | @@ -165,7 +141,7 @@ dependencies { | ||
| 165 | compile group: 'com.squareup.okhttp', name: 'okhttp', version: '2.7.5' | 141 | compile group: 'com.squareup.okhttp', name: 'okhttp', version: '2.7.5' |
| 166 | compile group: 'com.google.code.gson', name: 'gson', version: '2.7' | 142 | compile group: 'com.google.code.gson', name: 'gson', version: '2.7' |
| 167 | compile group: 'com.google.zxing', name: 'core', version: '3.3.0' | 143 | compile group: 'com.google.zxing', name: 'core', version: '3.3.0' |
| 168 | - compile group: 'com.umeng.analytics', name: 'umeng-analytics', version: '5.4.1' | 144 | +// compile group: 'com.umeng.analytics', name: 'umeng-analytics', version: '5.4.1' |
| 169 | compile group: 'com.nineoldandroids', name: 'library', version: '2.4.0' | 145 | compile group: 'com.nineoldandroids', name: 'library', version: '2.4.0' |
| 170 | compile group: 'com.squareup.retrofit2', name: 'retrofit', version: '2.0.2' | 146 | compile group: 'com.squareup.retrofit2', name: 'retrofit', version: '2.0.2' |
| 171 | compile group: 'com.squareup.retrofit2', name: 'converter-gson', version: '2.0.2' | 147 | compile group: 'com.squareup.retrofit2', name: 'converter-gson', version: '2.0.2' |
| @@ -188,7 +164,7 @@ task releaseToTesting(type: Copy) { | @@ -188,7 +164,7 @@ task releaseToTesting(type: Copy) { | ||
| 188 | from 'build/outputs/apk' | 164 | from 'build/outputs/apk' |
| 189 | // into 'E:/py' | 165 | // into 'E:/py' |
| 190 | if (isWindows()) | 166 | if (isWindows()) |
| 191 | - into '//192.168.4.214/root/apks' | 167 | + into '//192.168.4.241/root/apks' |
| 192 | else | 168 | else |
| 193 | into '/Volumes/root/apks' | 169 | into '/Volumes/root/apks' |
| 194 | include '*.apk' | 170 | include '*.apk' |
| 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 | - xmlns:tools="http://schemas.android.com/tools" | ||
| 4 | - package="com.xgimi.gimicinema" | ||
| 5 | - android:sharedUserId="android.uid.system"> | 3 | + xmlns:tools="http://schemas.android.com/tools" |
| 4 | + package="com.xgimi.gimicinema" | ||
| 5 | + android:sharedUserId="android.uid.system"> | ||
| 6 | 6 | ||
| 7 | - <uses-permission android:name="android.permission.INTERNET" /> | ||
| 8 | - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> | ||
| 9 | - <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" /> | ||
| 10 | - <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> | ||
| 11 | - <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> | ||
| 12 | - <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> | ||
| 13 | - <uses-permission android:name="android.permission.RESTART_PACKAGES" /> | ||
| 14 | - <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" /> | ||
| 15 | - <uses-permission android:name="android.permission.BLUETOOTH" /> | ||
| 16 | - <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> | 7 | + <uses-permission android:name="android.permission.INTERNET"/> |
| 8 | + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> | ||
| 9 | + <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/> | ||
| 10 | + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> | ||
| 11 | + <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> | ||
| 12 | + <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> | ||
| 13 | + <uses-permission android:name="android.permission.RESTART_PACKAGES"/> | ||
| 14 | + <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/> | ||
| 15 | + <uses-permission android:name="android.permission.BLUETOOTH"/> | ||
| 16 | + <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/> | ||
| 17 | 17 | ||
| 18 | <uses-permission | 18 | <uses-permission |
| 19 | - android:name="android.permission.FORCE_STOP_PACKAGES" | ||
| 20 | - tools:ignore="ProtectedPermissions" /> | ||
| 21 | - <uses-permission android:name="android.permission.READ_PHONE_STATE" /> | ||
| 22 | - <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> | 19 | + android:name="android.permission.FORCE_STOP_PACKAGES" |
| 20 | + tools:ignore="ProtectedPermissions"/> | ||
| 21 | + <uses-permission android:name="android.permission.READ_PHONE_STATE"/> | ||
| 22 | + <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/> | ||
| 23 | 23 | ||
| 24 | <!-- | 24 | <!-- |
| 25 | windows not support lable replace by gradle,just replace by string values | 25 | windows not support lable replace by gradle,just replace by string values |
| 26 | occour error: AndroidMainfest.xml:line:AAPT:Error parsing XML:not well-formed(invalid toke) -v.8.3 | 26 | occour error: AndroidMainfest.xml:line:AAPT:Error parsing XML:not well-formed(invalid toke) -v.8.3 |
| 27 | --> | 27 | --> |
| 28 | <application | 28 | <application |
| 29 | - android:name=".application.FangTangApplication" | ||
| 30 | - android:allowBackup="true" | ||
| 31 | - android:hardwareAccelerated="true" | ||
| 32 | - android:icon="@drawable/ic_launcher" | ||
| 33 | - android:label="@string/app_name" | ||
| 34 | - android:theme="@android:style/Theme.NoTitleBar.Fullscreen"> | ||
| 35 | - <meta-data | ||
| 36 | - android:name="UMENG_APPKEY" | ||
| 37 | - android:value="556ff5c367e58e3d5900180b" /> | ||
| 38 | - <meta-data | ||
| 39 | - android:name="UMENG_CHANNEL" | ||
| 40 | - android:value="${channel}" /> | 29 | + android:name=".application.FangTangApplication" |
| 30 | + android:allowBackup="true" | ||
| 31 | + android:hardwareAccelerated="true" | ||
| 32 | + android:icon="@drawable/ic_launcher" | ||
| 33 | + android:label="@string/app_name" | ||
| 34 | + android:theme="@android:style/Theme.NoTitleBar.Fullscreen"> | ||
| 35 | + <!-- <meta-data | ||
| 36 | + android:name="UMENG_APPKEY" | ||
| 37 | + android:value="556ff5c367e58e3d5900180b" /> | ||
| 38 | + <meta-data | ||
| 39 | + android:name="UMENG_CHANNEL" | ||
| 40 | + android:value="${channel}" />--> | ||
| 41 | <!-- <meta-data android:name="com.gimi.common.cinema.utils.CustomCachingGlideModule" android:value="GlideModule" /> --> | 41 | <!-- <meta-data android:name="com.gimi.common.cinema.utils.CustomCachingGlideModule" android:value="GlideModule" /> --> |
| 42 | 42 | ||
| 43 | <activity | 43 | <activity |
| 44 | - android:name=".activity.StartActivity" | ||
| 45 | - android:theme="@style/AppStartTheme"> | 44 | + android:name=".activity.StartActivity" |
| 45 | + android:theme="@style/AppStartTheme"> | ||
| 46 | <intent-filter> | 46 | <intent-filter> |
| 47 | - <action android:name="android.intent.action.MAIN" /> | 47 | + <action android:name="android.intent.action.MAIN"/> |
| 48 | 48 | ||
| 49 | - <category android:name="android.intent.category.LAUNCHER" /> | 49 | + <category android:name="android.intent.category.LAUNCHER"/> |
| 50 | </intent-filter> | 50 | </intent-filter> |
| 51 | </activity> | 51 | </activity> |
| 52 | - <activity android:name=".activity.SearchNewActivity" /> | ||
| 53 | - <activity android:name=".activity.PlayListActivity" /> | ||
| 54 | - <activity android:name=".activity.SettingActivity" /> | 52 | + <activity android:name=".activity.SearchNewActivity"/> |
| 53 | + <activity android:name=".activity.PlayListActivity"/> | ||
| 54 | + <activity android:name=".activity.SettingActivity"/> | ||
| 55 | <activity | 55 | <activity |
| 56 | - android:name=".activity.EnterPassWordActivity" | ||
| 57 | - android:theme="@style/DialogActivity" /> | ||
| 58 | - <activity android:name=".activity.MainActivity" /> | ||
| 59 | - <activity android:name=".activity.ChoseSourceActivity" /> | ||
| 60 | - <activity android:name=".cctvsix.activity.M1905MovieDetailActivity" /> | ||
| 61 | - <activity android:name=".cctvsix.activity.M1905MovieDetailActivity1" /> | ||
| 62 | - <activity android:name=".cctvsix.activity.M1905VideoListActivity" /> | ||
| 63 | - <activity android:name=".activity.AddCActivity" /> | ||
| 64 | - <activity android:name=".activity.SimpleAdsPlayActivity" /> | ||
| 65 | - <activity android:name=".activity.SimpleAdsPlayer2" /> | ||
| 66 | - <activity android:name=".activity.AdsPreVideoPlayerActivity" /> | ||
| 67 | - <activity android:name=".activity.ImageShowActivity" /> | ||
| 68 | - <activity android:name=".activity.CheckActivity" /> | 56 | + android:name=".activity.EnterPassWordActivity" |
| 57 | + android:theme="@style/DialogActivity"/> | ||
| 58 | + <activity android:name=".activity.MainActivity"/> | ||
| 59 | + <activity android:name=".activity.ChoseSourceActivity"/> | ||
| 60 | + <activity android:name=".cctvsix.activity.M1905MovieDetailActivity"/> | ||
| 61 | + <activity android:name=".cctvsix.activity.M1905MovieDetailActivity1"/> | ||
| 62 | + <activity android:name=".cctvsix.activity.M1905VideoListActivity"/> | ||
| 63 | + <activity android:name=".activity.AddCActivity"/> | ||
| 64 | + <activity android:name=".activity.SimpleAdsPlayActivity"/> | ||
| 65 | + <activity android:name=".activity.SimpleAdsPlayer2"/> | ||
| 66 | + <activity android:name=".activity.AdsPreVideoPlayerActivity"/> | ||
| 67 | + <activity android:name=".activity.ImageShowActivity"/> | ||
| 68 | + <activity android:name=".activity.CheckActivity"/> | ||
| 69 | 69 | ||
| 70 | - <service android:name=".service.MovieMessageService" /> | ||
| 71 | - <service android:name=".service.SearchMovieMessageService" /> | 70 | + <service android:name=".service.MovieMessageService"/> |
| 71 | + <service android:name=".service.SearchMovieMessageService"/> | ||
| 72 | <service | 72 | <service |
| 73 | - android:name=".service.AskService" | ||
| 74 | - android:persistent="true" | ||
| 75 | - android:priority="1000"> <!-- 免杀,?有没有起作用 --> | 73 | + android:name=".service.AskService" |
| 74 | + android:persistent="true" | ||
| 75 | + android:priority="1000"> <!-- 免杀,?有没有起作用 --> | ||
| 76 | <!-- 提高service优先级 --> | 76 | <!-- 提高service优先级 --> |
| 77 | <intent-filter> | 77 | <intent-filter> |
| 78 | - <action android:name="com.qnbar.ask.service" /> | 78 | + <action android:name="com.qnbar.ask.service"/> |
| 79 | </intent-filter> | 79 | </intent-filter> |
| 80 | </service> | 80 | </service> |
| 81 | 81 | ||
| 82 | <receiver android:name=".receiver.BootReceiver"> | 82 | <receiver android:name=".receiver.BootReceiver"> |
| 83 | <intent-filter> | 83 | <intent-filter> |
| 84 | - <action android:name="android.intent.action.BOOT_COMPLETED" /> | 84 | + <action android:name="android.intent.action.BOOT_COMPLETED"/> |
| 85 | </intent-filter> | 85 | </intent-filter> |
| 86 | </receiver> | 86 | </receiver> |
| 87 | <receiver android:name=".service.MovieCompleteReceiver"> | 87 | <receiver android:name=".service.MovieCompleteReceiver"> |
| 88 | <intent-filter> | 88 | <intent-filter> |
| 89 | - <action android:name="com.xgimi.gimicinema.get_data.movie_complete" /> | 89 | + <action android:name="com.xgimi.gimicinema.get_data.movie_complete"/> |
| 90 | </intent-filter> | 90 | </intent-filter> |
| 91 | </receiver> | 91 | </receiver> |
| 92 | 92 | ||
| 93 | - <activity android:name=".activity.MovieListsActivity" /> | ||
| 94 | - <activity android:name=".activity.MovieDetailMsgActivity" /> | 93 | + <activity android:name=".activity.MovieListsActivity"/> |
| 94 | + <activity android:name=".activity.MovieDetailMsgActivity"/> | ||
| 95 | 95 | ||
| 96 | <service | 96 | <service |
| 97 | - android:name=".service.CinemaControlService" | ||
| 98 | - android:enabled="true" | ||
| 99 | - android:exported="true"> | 97 | + android:name=".service.CinemaControlService" |
| 98 | + android:enabled="true" | ||
| 99 | + android:exported="true"> | ||
| 100 | <intent-filter> | 100 | <intent-filter> |
| 101 | - <action android:name="com.gimicinema.cinemacontrol" /> | 101 | + <action android:name="com.gimicinema.cinemacontrol"/> |
| 102 | 102 | ||
| 103 | - <category android:name="android.intent.category.DEFAULT" /> | 103 | + <category android:name="android.intent.category.DEFAULT"/> |
| 104 | </intent-filter> | 104 | </intent-filter> |
| 105 | </service> | 105 | </service> |
| 106 | <service android:name=".service.ProguardService"> | 106 | <service android:name=".service.ProguardService"> |
| 107 | <intent-filter> | 107 | <intent-filter> |
| 108 | - <action android:name="com.qnbar.proguard.service" /> | 108 | + <action android:name="com.qnbar.proguard.service"/> |
| 109 | </intent-filter> | 109 | </intent-filter> |
| 110 | </service> | 110 | </service> |
| 111 | 111 | ||
| 112 | - <activity android:name="com.qnbar.smc.AddMeshActivity" /> | ||
| 113 | - <activity android:name="com.qnbar.smc.DeviceScanningActivity" /> | ||
| 114 | - <activity android:name="com.qnbar.smc.DeviceSettingActivity" /> | ||
| 115 | - <activity android:name="com.qnbar.smc.MainActivity"></activity> | 112 | + <activity android:name="com.qnbar.smc.AddMeshActivity"/> |
| 113 | + <activity android:name="com.qnbar.smc.DeviceScanningActivity"/> | ||
| 114 | + <activity android:name="com.qnbar.smc.DeviceSettingActivity"/> | ||
| 115 | + <activity android:name="com.qnbar.smc.MainActivity"/> | ||
| 116 | 116 | ||
| 117 | <service | 117 | <service |
| 118 | - android:name="com.qnbar.smc.service.TelinkLightService" | ||
| 119 | - android:enabled="true" /> | 118 | + android:name="com.qnbar.smc.service.TelinkLightService" |
| 119 | + android:enabled="true"/> | ||
| 120 | <service android:name="com.qnbar.smc.service.SocketService"/> | 120 | <service android:name="com.qnbar.smc.service.SocketService"/> |
| 121 | 121 | ||
| 122 | <activity android:name="com.qnbar.smc.SimpleLightDemo"> | 122 | <activity android:name="com.qnbar.smc.SimpleLightDemo"> |
| 123 | - <!-- <intent-filter> | ||
| 124 | - <action android:name="android.intent.action.MAIN" /> | 123 | + <!-- <intent-filter> |
| 124 | + <action android:name="android.intent.action.MAIN" /> | ||
| 125 | 125 | ||
| 126 | - <category android:name="android.intent.category.LAUNCHER" /> | ||
| 127 | - </intent-filter>--> | 126 | + <category android:name="android.intent.category.LAUNCHER" /> |
| 127 | + </intent-filter>--> | ||
| 128 | </activity> | 128 | </activity> |
| 129 | + <!--门禁相关服务,必要!!!--> | ||
| 129 | <service android:name="com.bluetoothle.GREENBluetoothLeService" android:enabled="true"/> | 130 | <service android:name="com.bluetoothle.GREENBluetoothLeService" android:enabled="true"/> |
| 130 | </application> | 131 | </application> |
| 131 | </manifest> | 132 | </manifest> |
| @@ -12,7 +12,6 @@ import com.gimi.common.cinema.utils.AuthUtils; | @@ -12,7 +12,6 @@ import com.gimi.common.cinema.utils.AuthUtils; | ||
| 12 | import com.gimi.common.cinema.utils.LeeImageLoader; | 12 | import com.gimi.common.cinema.utils.LeeImageLoader; |
| 13 | import com.gimi.common.cinema.utils.SystemUtils; | 13 | import com.gimi.common.cinema.utils.SystemUtils; |
| 14 | import com.gimi.common.cinema.utils.Utils; | 14 | import com.gimi.common.cinema.utils.Utils; |
| 15 | -import com.umeng.analytics.MobclickAgent; | ||
| 16 | import com.xgimi.gimicinema.BuildConfig; | 15 | import com.xgimi.gimicinema.BuildConfig; |
| 17 | import com.xgimi.gimicinema.service.AskService; | 16 | import com.xgimi.gimicinema.service.AskService; |
| 18 | 17 | ||
| @@ -101,15 +100,7 @@ public class BaseActivity extends Activity { | @@ -101,15 +100,7 @@ public class BaseActivity extends Activity { | ||
| 101 | 100 | ||
| 102 | 101 | ||
| 103 | @Override | 102 | @Override |
| 104 | - protected void onPause() { | ||
| 105 | - MobclickAgent.onPause(this); | ||
| 106 | - super.onPause(); | ||
| 107 | - | ||
| 108 | - } | ||
| 109 | - | ||
| 110 | - @Override | ||
| 111 | protected void onResume() { | 103 | protected void onResume() { |
| 112 | - MobclickAgent.onResume(this); | ||
| 113 | super.onResume(); | 104 | super.onResume(); |
| 114 | bind(); | 105 | bind(); |
| 115 | if (agentType == 5 && AuthUtils.checkOfflineAuthTime(this)) { | 106 | if (agentType == 5 && AuthUtils.checkOfflineAuthTime(this)) { |
| @@ -39,7 +39,6 @@ import com.gimi.common.cinema.utils.OpenMMUtils; | @@ -39,7 +39,6 @@ import com.gimi.common.cinema.utils.OpenMMUtils; | ||
| 39 | import com.gimi.common.cinema.utils.ScreenUtils; | 39 | import com.gimi.common.cinema.utils.ScreenUtils; |
| 40 | import com.gimi.common.cinema.utils.T; | 40 | import com.gimi.common.cinema.utils.T; |
| 41 | import com.google.gson.Gson; | 41 | import com.google.gson.Gson; |
| 42 | -import com.umeng.analytics.MobclickAgent; | ||
| 43 | import com.xgimi.gimicinema.R; | 42 | import com.xgimi.gimicinema.R; |
| 44 | import com.xgimi.gimicinema.mview.IMovieDetailView; | 43 | import com.xgimi.gimicinema.mview.IMovieDetailView; |
| 45 | import com.xgimi.gimicinema.presenter.MovieDetailPresenter; | 44 | import com.xgimi.gimicinema.presenter.MovieDetailPresenter; |
| @@ -47,7 +46,6 @@ import com.xgimi.gimicinema.view.FocusBorderView; | @@ -47,7 +46,6 @@ import com.xgimi.gimicinema.view.FocusBorderView; | ||
| 47 | import com.xgimi.gimicinema.view.MovieItem; | 46 | import com.xgimi.gimicinema.view.MovieItem; |
| 48 | 47 | ||
| 49 | import java.util.ArrayList; | 48 | import java.util.ArrayList; |
| 50 | -import java.util.HashMap; | ||
| 51 | import java.util.List; | 49 | import java.util.List; |
| 52 | 50 | ||
| 53 | public class MovieDetailMsgActivity extends BaseActivity | 51 | public class MovieDetailMsgActivity extends BaseActivity |
| @@ -267,17 +265,11 @@ public class MovieDetailMsgActivity extends BaseActivity | @@ -267,17 +265,11 @@ public class MovieDetailMsgActivity extends BaseActivity | ||
| 267 | 265 | ||
| 268 | @Override | 266 | @Override |
| 269 | public void agreeTo() { | 267 | public void agreeTo() { |
| 270 | - HashMap<String, String> map = new HashMap<>(); | ||
| 271 | - map.put("movie_name", movieItem.getMovieName()); | ||
| 272 | - MobclickAgent.onEvent(this, "i_like_this_movie", map); | ||
| 273 | agreeTo.setText("已赞"); | 268 | agreeTo.setText("已赞"); |
| 274 | } | 269 | } |
| 275 | 270 | ||
| 276 | @Override | 271 | @Override |
| 277 | public void playMovie() { | 272 | public void playMovie() { |
| 278 | - HashMap<String, String> map = new HashMap<>(); | ||
| 279 | - map.put("movie_name", movieItem.getMovieName()); | ||
| 280 | - MobclickAgent.onEvent(this, "play_movie_collection", map); | ||
| 281 | presenter.playPath(); | 273 | presenter.playPath(); |
| 282 | } | 274 | } |
| 283 | 275 |
| @@ -8,7 +8,6 @@ import android.os.Build; | @@ -8,7 +8,6 @@ import android.os.Build; | ||
| 8 | import android.os.Looper; | 8 | import android.os.Looper; |
| 9 | import android.util.Log; | 9 | import android.util.Log; |
| 10 | import android.widget.Toast; | 10 | import android.widget.Toast; |
| 11 | -import com.umeng.analytics.MobclickAgent; | ||
| 12 | 11 | ||
| 13 | import java.lang.Thread.UncaughtExceptionHandler; | 12 | import java.lang.Thread.UncaughtExceptionHandler; |
| 14 | import java.lang.reflect.Field; | 13 | import java.lang.reflect.Field; |
| @@ -154,7 +153,6 @@ public class CrashHandler implements UncaughtExceptionHandler { | @@ -154,7 +153,6 @@ public class CrashHandler implements UncaughtExceptionHandler { | ||
| 154 | // String value = entry.getValue(); | 153 | // String value = entry.getValue(); |
| 155 | // sb.append(key + "=" + value + "\n"); | 154 | // sb.append(key + "=" + value + "\n"); |
| 156 | // } | 155 | // } |
| 157 | - MobclickAgent.reportError(mContext, ex); | ||
| 158 | 156 | ||
| 159 | // | 157 | // |
| 160 | // Writer writer = new StringWriter(); | 158 | // Writer writer = new StringWriter(); |
| @@ -26,7 +26,6 @@ import com.gimi.common.cinema.model.SambaMsg; | @@ -26,7 +26,6 @@ import com.gimi.common.cinema.model.SambaMsg; | ||
| 26 | import com.gimi.common.cinema.utils.SambaFileCharge; | 26 | import com.gimi.common.cinema.utils.SambaFileCharge; |
| 27 | import com.gimi.common.cinema.utils.SystemUtils; | 27 | import com.gimi.common.cinema.utils.SystemUtils; |
| 28 | import com.gimi.common.cinema.utils.Utils; | 28 | import com.gimi.common.cinema.utils.Utils; |
| 29 | -import com.umeng.analytics.MobclickAgent; | ||
| 30 | import com.xgimi.gimicinema.BuildConfig; | 29 | import com.xgimi.gimicinema.BuildConfig; |
| 31 | import com.xgimi.gimicinema.activity.CinemaConfig; | 30 | import com.xgimi.gimicinema.activity.CinemaConfig; |
| 32 | import com.xgimi.gimicinema.model.DBUpdateModelImpl; | 31 | import com.xgimi.gimicinema.model.DBUpdateModelImpl; |
| @@ -133,9 +132,6 @@ public class MovieListPresenter extends BasePresenter | @@ -133,9 +132,6 @@ public class MovieListPresenter extends BasePresenter | ||
| 133 | long lastUpdateTime = new File(newPath).lastModified(); | 132 | long lastUpdateTime = new File(newPath).lastModified(); |
| 134 | if (l - lastUpdateTime < 0) { | 133 | if (l - lastUpdateTime < 0) { |
| 135 | if (testUser) { | 134 | if (testUser) { |
| 136 | - HashMap<String, String> map = new HashMap<>(); | ||
| 137 | - map.put("user_test_download", SystemUtils.getPid(context, BuildConfig.MACHINE_TYPE)); | ||
| 138 | - MobclickAgent.onEvent(context, "update_local_db", map); | ||
| 139 | updateModel.updateLocalDb(context, this); | 135 | updateModel.updateLocalDb(context, this); |
| 140 | } | 136 | } |
| 141 | } else { | 137 | } else { |
| @@ -160,7 +156,6 @@ public class MovieListPresenter extends BasePresenter | @@ -160,7 +156,6 @@ public class MovieListPresenter extends BasePresenter | ||
| 160 | // restore from backup | 156 | // restore from backup |
| 161 | HashMap<String, String> map = new HashMap<>(); | 157 | HashMap<String, String> map = new HashMap<>(); |
| 162 | map.put("user_test_restore", SystemUtils.getPid(context, BuildConfig.MACHINE_TYPE)); | 158 | map.put("user_test_restore", SystemUtils.getPid(context, BuildConfig.MACHINE_TYPE)); |
| 163 | - MobclickAgent.onEvent(context, "restore_local_db", map); | ||
| 164 | updateModel.restoreLocalDb(context, this); | 159 | updateModel.restoreLocalDb(context, this); |
| 165 | view.hideProgress(); | 160 | view.hideProgress(); |
| 166 | } | 161 | } |
| @@ -243,9 +238,6 @@ public class MovieListPresenter extends BasePresenter | @@ -243,9 +238,6 @@ public class MovieListPresenter extends BasePresenter | ||
| 243 | 238 | ||
| 244 | //update server db file | 239 | //update server db file |
| 245 | if (testUser) { | 240 | if (testUser) { |
| 246 | - HashMap<String, String> map = new HashMap<>(); | ||
| 247 | - map.put("user_test_upload", SystemUtils.getPid(context, BuildConfig.MACHINE_TYPE)); | ||
| 248 | - MobclickAgent.onEvent(context, "update_server_db", map); | ||
| 249 | updateModel.updateServerDb(context, this); | 241 | updateModel.updateServerDb(context, this); |
| 250 | } | 242 | } |
| 251 | } | 243 | } |
Please
register
or
login
to post a comment