修改打点事件；添加ActWeb不显示标题栏的支持

app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java

@@ -207,7 +207,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                 break;
             case R.id.proxy_service_layout://代理
                 if (!TextUtils.isEmpty(agentUrl))
-                    Jump2View.getInstance().goWeb(activity, agentUrl, null);
+                    Jump2View.getInstance().goWeb(activity, agentUrl, "代理服务");
                 else
                     G.showToast(R.string.loading_data);
                 break;

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -299,7 +299,11 @@ public class Jump2View {
         Intent intent = new Intent(context, TryMakeMoneyact.class);
         intent.putExtra("is_succession", o instanceof Integer ? (Integer)o : 0);
         context.startActivity(intent);
-        UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_TASK_TRY);
+        if(o == Integer.valueOf(1)){
+            UMConfigUtils.Event.SHEEP_GAME_TASK.onEvent();
+        } else {
+            UMConfigUtils.Event.SHEEP_TASK_TRY.onEvent();
+        }
     }
 
     /**
@@ -752,7 +756,7 @@ public class Jump2View {
      * @param title
      */
     public void goWeb(Context context, String url, String title){
-        if(TextUtils.isEmpty(url)){
+        if(TextUtils.isEmpty(url) || TextUtils.isEmpty(title)){
             G.showToast(R.string.service_data_error);
             return;
         }
@@ -1232,6 +1236,7 @@ public class Jump2View {
         Intent intent = new Intent(activity, GamemakeMoneyAct.class);
         intent.putExtra("current_item", o);
         activity.startActivity(intent);
+        UMConfigUtils.Event.SHEEP_GAME_TASK.onEvent();
     }
     /**
      * 订单管理

app/src/main/java/com/sheep/gamegroup/util/UMConfigUtils.java

@@ -9,6 +9,7 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.statistics.AppStatistics;
 import com.sheep.gamegroup.statistics.AppStatisticsConfig;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 //import com.umeng.analytics.MobclickAgent;
 
@@ -28,7 +29,7 @@ public class UMConfigUtils {
     //统计点击次数需要的子subtype
     public enum  Event{
         GAME_DOWNLOAD                        ("GameDownload"),//游戏下载次数 5001
-        BANNER_CLICK_HORIZONTAL              ("BannerClickHorizontal"),//广告点击次数 5002
+        BANNER_CLICK_HORIZONTAL              ("BannerClickHorizontal"),//轮播图 广告点击次数 5002
         TAB_GAME                             ,//游戏页签 5003
         TAB_CATEGORY                         , //分类页签 5004
         TAB_SHEEP                            ,//小绵羊页签 5005
@@ -75,6 +76,9 @@ public class UMConfigUtils {
         PUNCH_RANKING_LIST            ,//点击本月排行榜 5046
         PUNCH_ACCUMULATIVE_LIST            ,//选择累计打卡 5047
         PUNCH_CONTINUATION           ,//选择连续打卡 5048
+        SHEEP_TIXIAN_COMMIT           ,//点击 提现提交按钮 5049
+        SHEEP_SEQUENTIAL_TASK           ,//点击进入连续任务界面 5050
+        SHEEP_GAME_TASK           ,//点击进入游戏任务界面 5051
         ;
         private String key;
         Event(String key){
@@ -100,6 +104,18 @@ public class UMConfigUtils {
         public void onEvent(Map<String, String> map){
             UMConfigUtils.onEvent(this, map);
         }
+
+        public static void println() {
+            Event[] items = Event.values();
+            for (int i = 0; i < items.length; i++) {
+                Event event = items[i];
+                LogUtil.println("打点Event", i, event.getKey(), event.getId());
+            }
+        }
+    }
+    static {
+        if(BuildConfig.DEBUG)
+            Event.println();
     }
 
     public enum IdEvent{

app/src/main/java/com/sheep/gamegroup/view/activity/ActWeb.java

@@ -56,8 +56,6 @@ public class ActWeb extends BaseCompatActivity {
 
     @BindView(R.id.webview)
     WebView mWebView;
-    @BindView(R.id.tv_next)
-    TextView tv_next;
     @BindView(R.id.layout_navigationBar)
     View layout_navigationBar;
 
@@ -69,20 +67,16 @@ public class ActWeb extends BaseCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_guide_on_hook);
+        setContentView(R.layout.act_web);
 
         url = getIntent().getStringExtra("url");
         title = getIntent().getStringExtra("title");//title为空时，不显示整个标题栏
 
         ButterKnife.bind(this);
-        if(title == null){
-            layout_navigationBar.setVisibility(View.GONE);
-        } else {
-            TitleBarUtils
-                    .getInstance()
-                    .setTitle(this, TextUtils.isEmpty(title) ? "加载中" : title)
-                    .setTitleFinish(this);
-        }
+        TitleBarUtils
+                .getInstance()
+                .setTitle(this, TextUtils.isEmpty(title) ? "加载中" : title)
+                .setTitleFinish(this);
         initWebViewSettings(mWebView);
         webViewSettings = mWebView.getSettings();
         webViewSettings.setJavaScriptCanOpenWindowsAutomatically(true);
@@ -93,7 +87,6 @@ public class ActWeb extends BaseCompatActivity {
         if (getIntent().hasExtra(EXTRA_WEBVIEW_NO_TITLE)) {//不显示标题
             findViewById(R.id.appbar_act_webview).setVisibility(View.GONE);
         }
-        tv_next.setVisibility(View.GONE);
 
         loadUrl();
     }
@@ -355,8 +348,22 @@ public class ActWeb extends BaseCompatActivity {
             return "";
         }
         @JavascriptInterface
+        public void showTitleBar(final boolean isShow) {
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    layout_navigationBar.setVisibility(isShow ? View.VISIBLE : View.GONE);
+                }
+            });
+        }
+        @JavascriptInterface
         public void goBack() {
-            finish();
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    finish();
+                }
+            });
         }
 
     }

app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -848,6 +848,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 //                        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_TRYMAKEMANY_PAGE));
                     }
                 });
+        UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_ACCEPT);
     }
 
     @Download.onPre

app/src/main/java/com/sheep/gamegroup/view/activity/WithdrawalAct.java

@@ -26,6 +26,7 @@ import com.sheep.gamegroup.presenter.WithdrawalPresenter;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.MyDbManager;
+import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.view.adapter.WithdrawalAdapter;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -152,6 +153,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
 
     private void doWithdrawal() {
 //        String price1 = ((GridViewEntity)withdrawalGreidview.getSelectedItem()).getValue();
+        UMConfigUtils.Event.SHEEP_TIXIAN_COMMIT.onEvent();
         if(ListUtil.hasIndex(wlLists, select)) {
             amount = wlLists.get(select).getGridViewEntity().getValue();
             if (TextUtils.isEmpty(amount)) {

app/src/main/res/layout/act_web.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/white_F9F9F9">
+
+    <include
+        layout="@layout/title"/>
+    <WebView
+        android:id="@+id/webview"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:scrollbars="none"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"/>
+</LinearLayout>

app/src/main/res/layout/activity_guide_on_hook.xml

@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:background="@color/white_F9F9F9">
 
@@ -16,7 +15,6 @@
         android:layout_margin="@dimen/content_padding_10"
         android:padding="@dimen/content_padding_10"
         android:scrollbars="none"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
         android:background="@drawable/x_shap_shadow_bg_rectgangle_white"/>
     <TextView
         android:id="@+id/tv_next"