Showing
4 changed files
with
13 additions
and
5 deletions
| @@ -142,6 +142,7 @@ dependencies { | @@ -142,6 +142,7 @@ dependencies { | ||
| 142 | compile group: 'com.google.code.gson', name: 'gson', version: '2.7' | 142 | compile group: 'com.google.code.gson', name: 'gson', version: '2.7' |
| 143 | compile group: 'com.google.zxing', name: 'core', version: '3.3.0' | 143 | compile group: 'com.google.zxing', name: 'core', version: '3.3.0' |
| 144 | // 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' |
| 145 | + compile 'com.umeng.analytics:analytics:latest.integration' | ||
| 145 | compile group: 'com.nineoldandroids', name: 'library', version: '2.4.0' | 146 | compile group: 'com.nineoldandroids', name: 'library', version: '2.4.0' |
| 146 | compile group: 'com.squareup.retrofit2', name: 'retrofit', version: '2.0.2' | 147 | compile group: 'com.squareup.retrofit2', name: 'retrofit', version: '2.0.2' |
| 147 | compile group: 'com.squareup.retrofit2', name: 'converter-gson', version: '2.0.2' | 148 | compile group: 'com.squareup.retrofit2', name: 'converter-gson', version: '2.0.2' |
| @@ -32,12 +32,12 @@ | @@ -32,12 +32,12 @@ | ||
| 32 | android:icon="@drawable/ic_launcher" | 32 | android:icon="@drawable/ic_launcher" |
| 33 | android:label="@string/app_name" | 33 | android:label="@string/app_name" |
| 34 | android:theme="@android:style/Theme.NoTitleBar.Fullscreen"> | 34 | android:theme="@android:style/Theme.NoTitleBar.Fullscreen"> |
| 35 | - <!-- <meta-data | 35 | + <meta-data |
| 36 | android:name="UMENG_APPKEY" | 36 | android:name="UMENG_APPKEY" |
| 37 | - android:value="556ff5c367e58e3d5900180b" /> | 37 | + android:value="58e70169677baa0510000632" /> |
| 38 | <meta-data | 38 | <meta-data |
| 39 | android:name="UMENG_CHANNEL" | 39 | android:name="UMENG_CHANNEL" |
| 40 | - android:value="${channel}" />--> | 40 | + android:value="ft" /> |
| 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 |
| @@ -12,6 +12,7 @@ import com.gimi.common.cinema.utils.AuthUtils; | @@ -12,6 +12,7 @@ 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; | ||
| 15 | import com.xgimi.gimicinema.BuildConfig; | 16 | import com.xgimi.gimicinema.BuildConfig; |
| 16 | import com.xgimi.gimicinema.service.AskService; | 17 | import com.xgimi.gimicinema.service.AskService; |
| 17 | 18 | ||
| @@ -29,6 +30,7 @@ public class BaseActivity extends Activity { | @@ -29,6 +30,7 @@ public class BaseActivity extends Activity { | ||
| 29 | protected void onCreate(Bundle savedInstanceState) { | 30 | protected void onCreate(Bundle savedInstanceState) { |
| 30 | // setBaseTheme(); | 31 | // setBaseTheme(); |
| 31 | super.onCreate(savedInstanceState); | 32 | super.onCreate(savedInstanceState); |
| 33 | + MobclickAgent.setDebugMode(true); | ||
| 32 | agentType = Utils.getInt(Utils.getSp(this), "agent-type", 0); | 34 | agentType = Utils.getInt(Utils.getSp(this), "agent-type", 0); |
| 33 | 35 | ||
| 34 | } | 36 | } |
| @@ -102,6 +104,7 @@ public class BaseActivity extends Activity { | @@ -102,6 +104,7 @@ public class BaseActivity extends Activity { | ||
| 102 | @Override | 104 | @Override |
| 103 | protected void onResume() { | 105 | protected void onResume() { |
| 104 | super.onResume(); | 106 | super.onResume(); |
| 107 | + MobclickAgent.onResume(this); | ||
| 105 | bind(); | 108 | bind(); |
| 106 | if (agentType == 5 && AuthUtils.checkOfflineAuthTime(this)) { | 109 | if (agentType == 5 && AuthUtils.checkOfflineAuthTime(this)) { |
| 107 | return; | 110 | return; |
| @@ -113,6 +116,11 @@ public class BaseActivity extends Activity { | @@ -113,6 +116,11 @@ public class BaseActivity extends Activity { | ||
| 113 | } | 116 | } |
| 114 | } | 117 | } |
| 115 | 118 | ||
| 119 | + @Override | ||
| 120 | + protected void onPause() { | ||
| 121 | + super.onPause(); | ||
| 122 | + MobclickAgent.onPause(this); | ||
| 123 | + } | ||
| 116 | 124 | ||
| 117 | SystemUtils systemUtils; | 125 | SystemUtils systemUtils; |
| 118 | 126 |
| @@ -21,7 +21,6 @@ import android.widget.RadioGroup; | @@ -21,7 +21,6 @@ import android.widget.RadioGroup; | ||
| 21 | import android.widget.RelativeLayout; | 21 | import android.widget.RelativeLayout; |
| 22 | import android.widget.TextView; | 22 | import android.widget.TextView; |
| 23 | import android.widget.Toast; | 23 | import android.widget.Toast; |
| 24 | - | ||
| 25 | import com.gimi.common.cinema.model.FolderItem; | 24 | import com.gimi.common.cinema.model.FolderItem; |
| 26 | import com.gimi.common.cinema.model.LocalMovieMessage; | 25 | import com.gimi.common.cinema.model.LocalMovieMessage; |
| 27 | import com.gimi.common.cinema.model.MessageEvent; | 26 | import com.gimi.common.cinema.model.MessageEvent; |
| @@ -34,7 +33,6 @@ import com.xgimi.gimicinema.R; | @@ -34,7 +33,6 @@ import com.xgimi.gimicinema.R; | ||
| 34 | import com.xgimi.gimicinema.mview.IMovieListView; | 33 | import com.xgimi.gimicinema.mview.IMovieListView; |
| 35 | import com.xgimi.gimicinema.presenter.MovieListPresenter; | 34 | import com.xgimi.gimicinema.presenter.MovieListPresenter; |
| 36 | import com.xgimi.gimicinema.view.MovieItem; | 35 | import com.xgimi.gimicinema.view.MovieItem; |
| 37 | - | ||
| 38 | import org.greenrobot.eventbus.EventBus; | 36 | import org.greenrobot.eventbus.EventBus; |
| 39 | import org.greenrobot.eventbus.Subscribe; | 37 | import org.greenrobot.eventbus.Subscribe; |
| 40 | import org.greenrobot.eventbus.ThreadMode; | 38 | import org.greenrobot.eventbus.ThreadMode; |
| @@ -142,6 +140,7 @@ public class MovieListsActivity extends BaseActivity implements IMovieListView { | @@ -142,6 +140,7 @@ public class MovieListsActivity extends BaseActivity implements IMovieListView { | ||
| 142 | clickPosition = data; | 140 | clickPosition = data; |
| 143 | LocalMovieMessage localMovieMessage = mData.get(data); | 141 | LocalMovieMessage localMovieMessage = mData.get(data); |
| 144 | presenter.jumpToDetail(localMovieMessage); | 142 | presenter.jumpToDetail(localMovieMessage); |
| 143 | +// throw new NullPointerException("my own error crash upload"); | ||
| 145 | } | 144 | } |
| 146 | }; | 145 | }; |
| 147 | 146 |
Please
register
or
login
to post a comment