2.6.2 发版本

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

@@ -604,7 +604,7 @@ public class Jump2View {
 
 
     /**
-     * 跳转到验证界面
+     * 实名认证
      * @param context
      * @param o
      * @param whereFrom 0:不作处理 1：跳到充值页面
@@ -614,6 +614,7 @@ public class Jump2View {
         i.putExtra("info", o);
         i.putExtra("where_from", whereFrom);
         context.startActivity(i);
+        UMConfigUtils.onEvent(UMConfigUtils.Event.USER_AUTHENTICATION_ENTER);
     }
     /**
      * 跳转到未绑定微信界面

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

@@ -81,6 +81,7 @@ public class UMConfigUtils {
         SHEEP_GAME_TASK           ,//点击进入游戏任务界面 5051
         XIANWAN_WEBVIEW           ,//闲玩 5052
         ORDER_MANAGER           ,//订单管理 5053
+        USER_AUTHENTICATION_ENTER           ,//进入实名认证界面 5054
         ;
         private String key;
         Event(String key){

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

@@ -220,6 +220,11 @@ public class ActWeb extends BaseCompatActivity {
                 return true;
             }
 
+            @Override
+            public void onPageFinished(WebView view, String url) {
+                super.onPageFinished(view, url);
+                imgReset();
+            }
         });
         webViewSettings.setJavaScriptEnabled(true);
         mWebView.addJavascriptInterface(new KFZSJs(), "kfzsjs");
@@ -418,4 +423,15 @@ public class ActWeb extends BaseCompatActivity {
         }
     }
 
+    private void imgReset(){
+        mWebView.loadUrl("javascript:(function(){" +
+                "var objs = document.getElementsByTagName('img'); " +
+                "for(var i=0;i<objs.length;i++)  " +
+                "{"
+                + "var img = objs[i];   " +
+                " img.style.maxWidth = '100%';" +
+                "}" +
+                "})()");
+    }
+
 }

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

@@ -11,6 +11,7 @@ import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -41,10 +42,6 @@ public class TaskDetailAddQQAct extends AbsChooseImageActivity {
 
     @BindView(R.id.detail_item_layout_1)
     View detail_item_layout_1;
-    @BindView(R.id.detail_item_layout_2)
-    View detail_item_layout_2;
-    @BindView(R.id.detail_item_layout_3)
-    View detail_item_layout_3;
     @BindView(R.id.name_tv)
     TextView nameTv;
     @BindView(R.id.date_tv)
@@ -63,6 +60,14 @@ public class TaskDetailAddQQAct extends AbsChooseImageActivity {
     TextView btnUpImag;
     @BindView(R.id.bottom_btn_layout)
     LinearLayout bottom_btn_layout;
+    @BindView(R.id.detail_item_layout_2)
+    LinearLayout detail_item_layout_2;
+    @BindView(R.id.detail_item_layout_3)
+    LinearLayout detail_item_layout_3;
+    @BindView(R.id.detail_shrae_friend_layout)
+    LinearLayout detail_shrae_friend_layout;
+    @BindView(R.id.item_layout)
+    RelativeLayout item_layout;
     private Activity activity;
 
     private NewbieTask newbieTask;
@@ -95,6 +100,10 @@ public class TaskDetailAddQQAct extends AbsChooseImageActivity {
 //            finish();
             return;
         }
+        item_layout.setBackgroundResource(R.drawable.sp_bg_white_solid_top);
+        detail_item_layout_2.setVisibility(View.VISIBLE);
+        detail_item_layout_3.setVisibility(View.VISIBLE);
+        detail_shrae_friend_layout.setVisibility(View.GONE);
         webText.setWebChromeClient(new WebChromeClient(){
 
         });

app/src/main/java/com/sheep/jiuyan/samllsheep/service/FloatService.java

@@ -250,7 +250,7 @@ public class FloatService extends Service {
         params = new WindowManager.LayoutParams();
 
         // 设置window type
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M){//6.0
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O){//6.0
             params.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
         }else {
             params.type =  WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;

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

@@ -39,7 +39,7 @@
                         android:id="@+id/ems_left_tv"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="用户须知"
+                        android:text="平台·用户须知"
                         android:gravity="center"
                         android:ems="2"
                         android:textColor="#D3AF57"
@@ -51,25 +51,43 @@
                         android:layout_marginRight="@dimen/common_margin_10"
                         android:layout_marginBottom="@dimen/content_padding_20"
                         android:layout_centerVertical="true"/>
-                    <TextView
-                        android:id="@+id/user_know_one_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/user_know_one"
-                        android:layout_toRightOf="@+id/ems_left_tv"/>
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/user_know_two"
-                        android:layout_below="@+id/user_know_one_tv"
-                        android:layout_toRightOf="@+id/ems_left_tv"
-                        android:layout_marginTop="@dimen/content_padding_20"/>
-                    <TextView
+                    <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/user_know_three"
+                        android:orientation="vertical"
                         android:layout_toRightOf="@+id/ems_left_tv"
-                        android:layout_alignParentBottom="true"/>
+                        android:layout_centerVertical="true">
+                        <TextView
+                            android:id="@+id/user_know_one_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/user_know_one"
+                            android:layout_toRightOf="@+id/ems_left_tv"/>
+                        <TextView
+                            android:id="@+id/user_know_two_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/user_know_two"
+                            android:layout_below="@+id/user_know_one_tv"
+                            android:layout_toRightOf="@+id/ems_left_tv"
+                            android:layout_marginTop="@dimen/content_padding_5"/>
+                        <TextView
+                            android:id="@+id/user_know_three_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/user_know_three"
+                            android:layout_below="@+id/user_know_two_tv"
+                            android:layout_toRightOf="@+id/ems_left_tv"
+                            android:layout_marginTop="@dimen/content_padding_5"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/user_know_four"
+                            android:layout_below="@+id/user_know_three_tv"
+                            android:layout_toRightOf="@+id/ems_left_tv"
+                            android:layout_marginTop="@dimen/content_padding_5"/>
+                    </LinearLayout>
+
                 </RelativeLayout>
                 <RelativeLayout
                     android:id="@+id/detail_item_layout_1"

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

@@ -118,7 +118,7 @@
             android:layout_gravity="center_vertical"
             android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
             android:visibility="visible"
-            android:layout_marginTop="@dimen/content_padding_1"
+            android:layout_marginTop="@dimen/content_padding_13"
             android:paddingTop="@dimen/content_padding_small"
             android:paddingBottom="@dimen/content_padding_15">
             <TextView

app/src/main/res/values/common.xml

@@ -40,6 +40,7 @@
     <dimen name="content_padding_3">3dp</dimen>
     <dimen name="content_padding_1">1dp</dimen>
     <dimen name="content_padding_2">2dp</dimen>
+    <dimen name="content_padding_5">5dp</dimen>
     <dimen name="content_padding_small">6dp</dimen>
     <dimen name="content_padding_8">8dp</dimen>
     <dimen name="content_padding_big">18dp</dimen>

app/src/main/res/values/strings.xml

@@ -44,9 +44,10 @@
     <string name="real_name_know_start">为了保障您的用卡安全，请</string>
     <string name="real_name_know">了解安全保障</string>
 
-    <string name="user_know_one">1、用户需在平台首次下载该游戏并注册;</string>
-    <string name="user_know_two">2、任务奖励充值消费需要满足充值条件;</string>
-    <string name="user_know_three">3、用户充值不满足需求，平台将以绵羊币的方式退还给小绵羊用户。</string>
+    <string name="user_know_one">1、用户需在小绵羊首次下载本游戏并进行注册;</string>
+    <string name="user_know_two">2、任务奖励的金额消耗需要满足相应的充值条件;</string>
+    <string name="user_know_three">3、若用户的充值不能满足相应条件，则平台会以绵羊币的形式退还给用户，您仍然可以在下次充值继续使用;</string>
+    <string name="user_know_four">4、下载成功后，请进入游戏任务—我的游戏，点击充值进行消费;</string>
 
     <string name="supplement_explain">部分机型的用户需要去手机设置里开启允许平台监控的权限，方可点击 \"领取奖励\" 完成</string>
     <string name="supplement_explain_n">补充说明</string>