增加手机绑定、2.6部分提交

app/src/main/AndroidManifest.xml

@@ -140,6 +140,7 @@
         <!--2.0-->
         <activity android:name="com.sheep.gamegroup.view.activity.LoginAct"
             android:theme="@style/FullScreenTheme"
+            android:launchMode="singleTask"
             android:screenOrientation="portrait">
 
         </activity>
@@ -181,7 +182,8 @@
         <activity android:name="com.sheep.gamegroup.view.activity.WithdrawalListAct"
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ChangeTelAct"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait"
+            android:launchMode="singleTask"/>
         <activity android:name="com.sheep.gamegroup.view.activity.TaskDetailAct"
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.DialogToastAct"

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

@@ -82,6 +82,9 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sunfusheng.marqueeview.MarqueeView;
+import com.umeng.socialize.ShareAction;
+import com.umeng.socialize.UMShareListener;
+import com.umeng.socialize.bean.SHARE_MEDIA;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -441,6 +444,34 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             case R.id.icon_layout://
                 if(BuildConfig.DEBUG) {
                     TestUtil.test(activity);
+                    new ShareAction(getActivity())
+                            .withText("hehe")
+                            .setDisplayList(
+                                    SHARE_MEDIA.QQ,
+                                    SHARE_MEDIA.WEIXIN)
+                            .setCallback(new UMShareListener() {
+                                @Override
+                                public void onStart(SHARE_MEDIA share_media) {
+                                    Log.e("start---"+share_media.getName(), share_media.getName());
+                                }
+
+                                @Override
+                                public void onResult(SHARE_MEDIA share_media) {
+                                    Log.e("result---"+share_media.getName(), share_media.getName());
+                                }
+
+                                @Override
+                                public void onError(SHARE_MEDIA share_media, Throwable throwable) {
+                                    Log.e("error---"+share_media.getName(), share_media.getName());
+                                }
+
+                                @Override
+                                public void onCancel(SHARE_MEDIA share_media) {
+                                    Log.e("cancel---"+share_media.getName(), share_media.getName());
+                                }
+                            })
+                            .open();
+
                 }else
                     Jump2View.getInstance().goPersonnalCenterView(activity, null);
                 break;
@@ -919,6 +950,10 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                         showToast("打卡赚钱");
                         Jump2View.getInstance().goSignCardAct(activity, null);
                         break;
+                    case 7://玩转游戏
+                        Jump2View.getInstance()
+                                .goMainGame(activity);
+                        break;
                     default:
                         G.showToast(R.string.coming_soon);
                         break;

app/src/main/java/com/sheep/gamegroup/model/entity/RecyleType.java

@@ -11,6 +11,8 @@ public enum RecyleType  implements Serializable {
     NONE,//无用占位
     RELEASE_TASK,//获取已发布的
     RUN_TASK,//获取我正在运行的任务
+    BEGIN_TASK,//即将开始
+    GAME_TASK,//我的游戏
     START_ON_HOOK,//开始挂机
     ABNORMAL_ON_HOOK,//挂机不正常
     NORMAL_ON_HOOK,//挂机正常

app/src/main/java/com/sheep/gamegroup/model/util/SheepSubscriber.java

@@ -63,6 +63,7 @@ public abstract class SheepSubscriber<T> extends Subscriber<T> {
                     Jump2View.getInstance().gotoLoginAgain();
                     return;
                 }
+
                 BaseMessage baseMessage;
                 if(throwable.message.startsWith("{")){
                     baseMessage = JSONObject.parseObject(throwable.message, BaseMessage.class);
@@ -86,6 +87,10 @@ public abstract class SheepSubscriber<T> extends Subscriber<T> {
                     }
                 }
 
+                if(throwable.code == 302 && baseMessage.getCode() == 30001){
+                    Jump2View.getInstance().goBindPhone(SheepApp.mContext,baseMessage.getCode());
+                    return;
+                }
 
                 if(baseMessage.getCode() == 0)
                     baseMessage.setCode(throwable.code);

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

@@ -545,6 +545,8 @@ public class Jump2View {
      */
     public void goBindPhone(Context context, Object o){
         Intent i = new Intent(context, ChangeTelAct.class);
+        if(o != null && o instanceof Integer)
+            i.putExtra("where_from", (Integer) o);
         context.startActivity(i);
     }
     /**

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

@@ -21,6 +21,7 @@ import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.presenter.PhoneContract;
 import com.sheep.gamegroup.presenter.PhonePresenter;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.SelfCountDownTimer;
 import com.sheep.gamegroup.util.UMConfigUtils;
@@ -89,6 +90,8 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
     private SelfCountDownTimer selfCountDownTimer;
     private boolean canGetCaptchaPhone = true;
 
+    private int where_from ;
+
     @Override
     protected int getLayoutId() {
         return R.layout.changge_tel_layout;
@@ -102,10 +105,19 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
                 .phoneModule(new PhoneModule(this))
                 .build()
                 .inject(this);
-
+        where_from = getIntent().getIntExtra("where_from", 0);
         TitleBarUtils.getInstance()
                 .setTitle(this, noticeStr)
-                .setTitleFinish(this);
+                .setTitleFinish(this, new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        if(where_from > 0){
+                            Jump2View.getInstance()
+                                    .gotoLoginAgain();
+                        }
+                        finish();
+                    }
+                });
         try {
             userEntity = MyDbManager.getInstance()
                     .dbFindUser();
@@ -345,6 +357,10 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
     @Override
     public void bindTelSuccess(BaseMessage o) {
         G.showToast(o.getMsg()+"");
+        if(where_from > 0){
+            Jump2View.getInstance()
+                    .gotoMain(activity);
+        }
         finish();
     }
 

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

@@ -61,7 +61,7 @@ public class TryMakeMoneyact extends BaseActivity {
     private Activity activity;
 
     private AdpTryMakemoney mAdapter;
-    private String[] titles = new String[]{"推荐任务", "即将开始"};
+    private String[] titles = new String[]{"推荐任务", "我的游戏"};
 
     private AdpTrymakemoneyTabGridview tabGridviewAdp;
     private ArrayList<Object> gridviewListAll = new ArrayList<>();
@@ -112,6 +112,26 @@ public class TryMakeMoneyact extends BaseActivity {
 
         tabGridviewAdp = new AdpTrymakemoneyTabGridview(activity, gridviewList);
         tabGridview.setAdapter(tabGridviewAdp);
+        indicator.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                if(tab.getPosition() == 0){
+                    task_gridview_layout.setVisibility(View.VISIBLE);
+                }else {
+                    task_gridview_layout.setVisibility(View.GONE);
+                }
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+
+            }
+        });
     }
 
     @Override

app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -1,6 +1,7 @@
 package com.sheep.gamegroup.view.adapter;
 
 import android.content.Context;
+import android.support.annotation.NonNull;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Html;
@@ -16,6 +17,7 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder;
 import com.kfzs.duanduan.adp.AdpCommonRecy;
+import com.kfzs.duanduan.utils.ApkUtils;
 import com.sheep.gamegroup.model.entity.RecyleObj;
 import com.sheep.gamegroup.model.entity.RecyleType;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
@@ -31,7 +33,9 @@ import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -54,7 +58,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
     @Inject
     TryMakeMoneyPresenter presenter;
     private Context context;
-    private int type = 0;//0:推荐 1:热门 2:预约
+    private int type = 0;//0:推荐 1:热门 2:预约 3:游戏推荐
     private int is_succession;//0:一般任务 1:连续任务
 
     public TryMakeMoneyAdp(Context context) {
@@ -68,9 +72,9 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
         RecyleType recyleType = RecyleType.values()[type];
         switch (recyleType){
             case RELEASE_TASK:
-                resId = R.layout.try_mkmy_release_task_list;
-                break;
+            case BEGIN_TASK:
             case RUN_TASK:
+            case GAME_TASK:
                 resId = R.layout.try_mkmy_release_task_list;
                 break;
         }
@@ -85,10 +89,14 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 bindReleaseTask(holder, (List<TaskReleaseEty>) recyleObj.getDataObj());
                 break;
             case RUN_TASK:
-//                List<TaskAcceptedEty> etyList = new ArrayList<>();
-//                etyList.add((TaskAcceptedEty) recyleObj.getDataObj());
                 bindRunTask(holder, (List<TaskAcceptedEty>) recyleObj.getDataObj());
                 break;
+            case BEGIN_TASK://即将开始
+                bindReleaseTask(holder, (List<TaskReleaseEty>) recyleObj.getDataObj());
+                break;
+            case GAME_TASK://我的游戏
+                bindGameTask(holder, (List<TaskReleaseEty>) recyleObj.getDataObj());
+                break;
         }
 
     }
@@ -126,6 +134,157 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
 
     /**
+     * 我的游戏
+     * @param holder
+     * @param etyList
+     */
+    private void bindGameTask(ViewHolder holder, final List<TaskReleaseEty> etyList) {
+        RecyclerView recyclerView = holder.getView(R.id.release_task_listview, RecyclerView.class);
+        recyclerView.setHasFixedSize(true);
+        recyclerView.setLayoutManager(new LinearLayoutManager(context));
+        recyclerView.setAdapter(new RecyclerView.Adapter() {
+            @NonNull
+            @Override
+            public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
+                LinearLayout view = (LinearLayout) LayoutInflater.from(context)
+                        .inflate(R.layout.try_makemoney_item_recommend, viewGroup, false);
+                RecyclerView.ViewHolder viewHolder = new RecyclerView.ViewHolder(view) {
+                    @Override
+                    public String toString() {
+                        return super.toString();
+                    }
+                };
+                return viewHolder;
+            }
+
+            @Override
+            public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, final int i) {
+                if(etyList.get(i) == null || etyList.get(i).getTask() == null){
+                    return;
+                }
+                viewHolder.itemView.setTag(TAG_ID_TEMP, etyList.get(i).getId());
+                TextView detail_task_tv = viewHolder.itemView.findViewById(R.id.detail_task_tv);
+                if(i == 0){
+                    viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.VISIBLE);
+                    viewHolder.itemView.findViewById(R.id.item_title_iv).setVisibility(View.GONE);
+                    String titleStr = "推荐";
+                    int resourceId = R.mipmap.task_hot_icon;
+                    switch (type){
+                        case 0:
+                            titleStr = "推荐";
+                            break;
+                        case 1:
+                            titleStr = "热门任务";
+                            viewHolder.itemView.findViewById(R.id.item_title_iv).setVisibility(View.VISIBLE);
+                            Glide.with(context)
+                                    .load(resourceId)
+                                    .apply(new RequestOptions().placeholder(resourceId))
+                                    .into((ImageView) viewHolder.itemView.findViewById(R.id.item_title_iv));
+                            break;
+                        case 2:
+                            titleStr = "即将开始";
+                            break;
+                        default:
+                            titleStr = "推荐";
+                            break;
+                    }
+                    ((TextView)viewHolder.itemView.findViewById(R.id.item_title_tv)).setText(titleStr+"");
+
+                }else{
+                    viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.GONE);
+                    viewHolder.itemView.findViewById(R.id.item_title_iv).setVisibility(View.GONE);
+                }
+                if(i == getItemCount()-1){
+                    viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.GONE);
+                }else {
+                    viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.VISIBLE);
+                }
+                detail_task_tv.setText("去充值");
+                ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
+                        "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(etyList.get(i).getDeadline()))+"");
+
+                viewHolder.itemView.findViewById(R.id.cancel_task_tv).setVisibility(View.GONE);
+
+                //CommonUtil.getInstance().getCharSequence(context, etyList.get(i).getName(), "")
+                ((TextView)viewHolder.itemView.findViewById(R.id.item_anem_tv)).setText(etyList.get(i).getName()+"");
+                TextView task_type_tv = viewHolder.itemView.findViewById(R.id.task_type_tv);
+                task_type_tv.setVisibility(View.VISIBLE);
+                //领取任务
+                final boolean isInstall = PackageUtil.isAppInstalled(SheepApp.mContext, etyList.get(i).getTask().getPackage_names());
+                String taskTypeTvValue = "下载游戏";
+                if(isInstall){//已经安装
+                    taskTypeTvValue = "启动游戏";
+                    PackageUtil.startApp(SheepApp.mContext, etyList.get(i).getTask().getPackage_names());
+                }else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(mContext, etyList.get(i).getTask().getPackage_names(), ""))){
+                    taskTypeTvValue = "安装游戏";
+                    ApkUtils.installApk(SheepApp.mContext, PackageUtil.isExistsFile(mContext, etyList.get(i).getTask().getPackage_names(), ""));
+                }else {
+                    taskTypeTvValue = "下载游戏";
+                }
+
+                task_type_tv.setText(taskTypeTvValue+"");
+                ((TextView)viewHolder.itemView.findViewById(R.id.item_num_tv)).setText("剩余"+ etyList.get(i).getLast_num()+"份");
+                ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ etyList.get(i).getBonus() +"元");
+                //任务领取
+                task_type_tv.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        if(isInstall){//已经安装
+                            PackageUtil.startApp(SheepApp.mContext, etyList.get(i).getTask().getPackage_names());
+                        }else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(mContext, etyList.get(i).getTask().getPackage_names(), ""))){
+                            ApkUtils.installApk(SheepApp.mContext, PackageUtil.isExistsFile(mContext, etyList.get(i).getTask().getPackage_names(), ""));
+                        }else {
+                        }
+                    }
+                });
+                detail_task_tv.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        if(!ListUtil.hasIndex(etyList, i)){
+                            G.showToast(R.string.loading_data);
+                            return;
+                        }
+                        TaskEty taskEty = etyList.get(i).getTask();
+                        if(taskEty == null){
+                            G.showToast(R.string.loading_data);
+                            return;
+                        }
+                        taskEty.setRunTask(0);
+                        taskEty.setRelease_task_id(etyList.get(i).getId());
+                        taskEty.setName(etyList.get(i).getName());
+                        taskEty.setAcceptedTaskId(etyList.get(i).getAccepted_task_id());
+                        Jump2View.getInstance().goDialogActivityView(context, taskEty);
+                    }
+                });
+                Glide.with(context)
+                        .load(etyList.get(i).getTask().getIcon()+"")
+                        .apply(new RequestOptions().placeholder(R.mipmap.x_ic_def_head))
+                        .into((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv));
+                viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        if(!ListUtil.hasIndex(etyList, i)){
+                            return;
+                        }
+                        TaskEty taskEty = etyList.get(i).getTask();
+                        taskEty.setRunTask(0);
+                        taskEty.setBonus(etyList.get(i).getBonus());
+                        taskEty.setRelease_task_id(etyList.get(i).getId());
+                        taskEty.setName(etyList.get(i).getName());
+                        Jump2View.getInstance().goTaskDetailView(context,  etyList.get(i).getId());
+                    }
+                });
+                TestUtil.setDebugDownLoad(context, viewHolder.itemView, etyList.get(i).getTask());
+            }
+
+            @Override
+            public int getItemCount() {
+                return etyList.size();
+            }
+        });
+    }
+
+    /**
      * 获取已发布的
      */
     private void bindReleaseTask(ViewHolder holder, final List<TaskReleaseEty> etyList){

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/TitleBarUtils.java

@@ -76,6 +76,11 @@ public class TitleBarUtils {
                 });
         return mTitleBarUtils;
     }
+    public TitleBarUtils setTitleFinish(final Activity activity, View.OnClickListener listener) {
+        activity.findViewById(R.id.img_baseactivity_title)
+                .setOnClickListener(listener);
+        return mTitleBarUtils;
+    }
 
 
     /**

app/src/main/res/drawable-um/umeng_socialize_btn_bg.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@android:color/transparent" />
+    <stroke android:width="1dp"
+        android:color="#ffffff"
+
+        />
+
+
+</shape>

app/src/main/res/drawable-um/umeng_socialize_edit_bg.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@android:color/transparent" />
+    <stroke android:width="1dp"
+        android:color="#C3C6C9"
+
+        />
+
+
+</shape>

app/src/main/res/drawable/sp_bg_blue_solid_gray.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners
+        android:topLeftRadius="0dp"
+        android:topRightRadius="0dp"
+        android:bottomLeftRadius="15dp"
+        android:bottomRightRadius="15dp"/>
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/gray"/>
+    <solid
+        android:color="@color/blue_E2F4FE"/>
+
+</shape>

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <com.umeng.socialize.shareboard.SocializeImageView
+        android:id="@+id/socialize_image_view"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:padding="5dp"
+        android:src="@drawable/umeng_socialize_menu_default" />
+
+    <TextView
+        android:id="@+id/socialize_text_view"
+        android:layout_width="63dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:text="未知"
+        android:textSize="12sp" />
+
+</LinearLayout>

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

@@ -30,13 +30,13 @@
                     android:id="@+id/detail_item_layout_1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-                    android:padding="@dimen/content_padding_10"
                     android:layout_margin="@dimen/content_padding_10">
                     <RelativeLayout
                         android:id="@+id/item_layout"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+                        android:padding="@dimen/content_padding_10">
                         <ImageView
                             android:id="@+id/icon_iv"
                             android:layout_width="@dimen/view_size_60"
@@ -95,7 +95,32 @@
                         android:layout_alignParentRight="true"
                         android:layout_below="@+id/item_layout"
                         android:background="@drawable/sp_bg_gradient_rectangle_yellow"
+                        android:visibility="gone"
                         android:layout_alignParentBottom="true"/>
+                    <LinearLayout
+                        android:id="@+id/detail_shrae_friend_layout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_below="@+id/item_layout"
+                        android:padding="@dimen/content_padding_10"
+                        android:background="@drawable/sp_bg_blue_solid_gray">
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="邀请好友完成任务，可额外获取任务奖励的20%哦!"
+                            style="@style/nomal_txt_style"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="发送给好友"
+                            android:textColor="@color/txt_bule"
+                            android:textSize="@dimen/text_size_3"
+                            android:layout_gravity="center_vertical"
+                            android:padding="@dimen/common_margin_10"
+                            android:background="@drawable/sp_appointment_bg"/>
+                    </LinearLayout>
                 </RelativeLayout>
 
                 <com.sheep.gamegroup.util.MyListview

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

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="#D4E0E5">
+
+
+    <RelativeLayout
+        android:id="@+id/umeng_socialize_titlebar"
+        android:layout_width="match_parent"
+        android:layout_height="54dp"
+        android:background="#0086DC">
+
+        <TextView
+            android:id="@+id/umeng_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text=""
+            android:textColor="#ffffff"
+            android:textSize="18sp" />
+
+        <RelativeLayout
+            android:id="@+id/umeng_back"
+            android:layout_width="60dp"
+            android:layout_height="match_parent"
+
+            android:onClick="onCancel"
+            android:visibility="visible">
+
+            <ImageButton
+
+                android:layout_width="12dp"
+                android:layout_height="20dp"
+                android:layout_centerVertical="true"
+                android:background="@drawable/umeng_socialize_back_icon"
+                android:layout_marginLeft="15dp"
+                android:scaleType="center" />
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/umeng_share_btn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerInParent="true"
+            android:layout_marginRight="10dp"
+            android:background="@drawable/umeng_socialize_btn_bg"
+            android:padding="4dp"
+            android:text="分享"
+            android:textColor="#ffffff" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/umeng_socialize_follow"
+        android:layout_width="fill_parent"
+        android:layout_height="40dp"
+        android:layout_alignParentBottom="true"
+        android:background="#AAAAAA"
+        android:visibility="visible">
+
+        <CheckBox
+            android:id="@+id/umeng_socialize_follow_check"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:checked="true"
+            android:visibility="gone" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="15dp"
+            android:layout_toRightOf="@id/umeng_socialize_follow_check"
+            android:text="关注官方微博"
+            android:textColor="#f8f8f8"
+            android:textSize="16sp"
+            android:visibility="gone" />
+    </RelativeLayout>
+
+    <!--<LinearLayout-->
+        <!--android:id="@+id/webView_container"-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="match_parent"-->
+        <!--android:layout_above="@id/umeng_socialize_follow"-->
+        <!--android:layout_below="@id/umeng_socialize_titlebar"-->
+        <!--android:orientation="horizontal"-->
+        <!--android:visibility="visible" />-->
+
+    <WebView
+        android:id="@+id/webView"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="#F2F5F6"
+        android:layout_above="@id/umeng_socialize_follow"
+        android:layout_below="@id/umeng_socialize_titlebar"
+        android:visibility="visible" />
+
+    <RelativeLayout
+        android:id="@+id/progress_bar_parent"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_below="@id/umeng_socialize_titlebar"
+        android:background="#F2F5F6" >
+
+        <LinearLayout
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_centerInParent="true"
+            android:orientation="horizontal">
+
+            <ProgressBar
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_margin="10dp" />
+        </LinearLayout>
+    </RelativeLayout>
+
+</RelativeLayout>

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

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#D4E0E5"
+    android:id="@+id/root"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/umeng_socialize_share_titlebar"
+        android:layout_width="match_parent"
+        android:layout_height="54dp"
+        android:background="#0086DC">
+
+        <TextView
+            android:id="@+id/umeng_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text=""
+            android:textColor="#ffffff"
+            android:textSize="18sp" />
+
+        <RelativeLayout
+            android:id="@+id/umeng_back"
+            android:layout_width="50dp"
+            android:layout_height="match_parent"
+            android:onClick="onCancel"
+            android:visibility="visible">
+
+            <ImageButton
+                android:layout_width="12dp"
+                android:layout_height="20dp"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="15dp"
+                android:background="@drawable/umeng_socialize_back_icon"
+                android:clickable="false"
+                android:scaleType="center" />
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/umeng_share_btn"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:layout_centerInParent="true"
+            android:gravity="center_vertical"
+            android:paddingLeft="15dp"
+            android:paddingRight="15dp"
+            android:text="分享"
+            android:textColor="#ffffff"
+            android:textSize="15sp" />
+    </RelativeLayout>
+
+    <EditText
+        android:id="@+id/umeng_socialize_share_edittext"
+        android:layout_width="fill_parent"
+        android:layout_height="180dp"
+        android:layout_below="@id/umeng_socialize_share_titlebar"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:paddingTop="8dp"
+        android:background="#ffffff"
+        android:bufferType="spannable"
+        android:gravity="top"
+        android:hint="编辑分享内容"
+        android:lineSpacingExtra="3dp"
+        android:paddingBottom="10dp"
+        android:textColor="#000000"
+        android:textSize="15sp" />
+
+    <TextView
+        android:id="@+id/umeng_socialize_share_word_num"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignRight="@id/umeng_socialize_share_edittext"
+        android:background="#ffffff"
+        android:layout_below="@id/umeng_socialize_share_edittext"
+        android:paddingBottom="10dp"
+        android:paddingRight="15dp"
+        android:gravity="right"
+        android:singleLine="true"
+        android:textColor="#98999B"
+        android:textSize="14sp" />
+
+    <RelativeLayout
+        android:id="@+id/umeng_socialize_share_bottom_area"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/umeng_socialize_share_word_num"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:background="#F2F5F6"
+        android:visibility="gone">
+        <RelativeLayout
+            android:layout_width="62dp"
+            android:layout_height="62dp"
+            android:layout_centerVertical="true"
+            android:layout_marginBottom="15dp"
+            android:layout_marginLeft="15dp"
+            android:id="@+id/umeng_image_edge"
+            android:layout_marginTop="15dp"
+           android:background="@drawable/umeng_socialize_edit_bg"
+            >
+        <ImageView
+            android:id="@+id/umeng_share_icon"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+           android:layout_centerInParent="true"
+            android:src="#2c3035" />
+        </RelativeLayout>
+    <TextView
+        android:layout_width="280dp"
+        android:id="@+id/umeng_web_title"
+        android:layout_toRightOf="@id/umeng_image_edge"
+        android:layout_marginLeft="40dp"
+        android:layout_marginTop="20dp"
+        android:textColor="#575A5C"
+        android:singleLine="true"
+        android:textSize="14sp"
+        android:visibility="gone"
+        android:layout_height="wrap_content" />
+
+    <ImageView
+        android:id="@+id/umeng_del"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_alignRight="@id/umeng_image_edge"
+        android:layout_alignTop="@id/umeng_image_edge"
+        android:layout_marginRight="-10dp"
+        android:layout_marginTop="-10dp"
+        android:background="@drawable/umeng_socialize_delete" />
+
+
+    </RelativeLayout>
+
+</RelativeLayout>

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

@@ -27,6 +27,7 @@
     <color name="yellow_start">#f4c76c</color>
     <color name="yellow_end">#fd9c11</color>
     <color name="blue_start">#80d2fe</color>
+    <color name="blue_E2F4FE">#E2F4FE</color>
     <color name="blue_end">#1394e8</color>
     <color name="blue_34a6e7">#34a6e7</color>
     <color name="blue_FF53BBF2">#FF53BBF2</color>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="umeng_socialize_sharetosina">分享到新浪微博</string>
+    <string name="umeng_socialize_sharetodouban">分享到豆瓣</string>
+    <string name="umeng_socialize_sharetorenren">分享到人人网</string>
+
+    <string name="umeng_socialize_sharetotencent">分享到腾讯微博</string>
+    <string name="umeng_socialize_sharetotwitter">分享到twitter</string>
+    <string name="umeng_socialize_sharetolinkin">分享到领英</string>
+</resources>

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

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--<style name="ACPLDialog">-->
+        <!--<item name="android:windowFrame">@null</item>-->
+        <!--<item name="android:windowNoTitle">true</item>-->
+        <!--<item name="android:windowIsFloating">true</item>-->
+        <!--<item name="android:windowContentOverlay">@null</item>-->
+    <!--</style>-->
+    <!--<style name="umeng_socialize_action_bar_itemlayout">-->
+        <!--<item name="android:layout_height">fill_parent</item>-->
+        <!--<item name="android:layout_width">fill_parent</item>-->
+        <!--<item name="android:layout_weight">1</item>-->
+        <!--<item name="android:paddingLeft">4dp</item>-->
+        <!--<item name="android:paddingTop">4dp</item>-->
+        <!--<item name="android:paddingRight">4dp</item>-->
+        <!--<item name="android:gravity">center_vertical</item>-->
+    <!--</style>-->
+
+    <!--<style name="umeng_socialize_action_bar_item_im">-->
+        <!--<item name="android:layout_width">25dp</item>-->
+        <!--<item name="android:layout_height">25dp</item>-->
+        <!--<item name="android:scaleType">fitCenter</item>-->
+        <!--<item name="android:layout_centerVertical">true</item>-->
+    <!--</style>-->
+
+    <!--<style name="umeng_socialize_action_bar_item_tv">-->
+        <!--<item name="android:layout_width">wrap_content</item>-->
+        <!--<item name="android:layout_height">fill_parent</item>-->
+        <!--<item name="android:layout_marginLeft">5dp</item>-->
+        <!--<item name="android:text">999</item>-->
+        <!--<item name="android:gravity">center</item>-->
+        <!--<item name="android:textColor">#ffffff</item>-->
+        <!--<item name="android:textSize">12sp</item>-->
+        <!--<item name="android:textStyle">bold</item>-->
+    <!--</style>-->
+
+    <!--网页授权的布局-->
+    <style name="umeng_socialize_popup_dialog" parent="@android:style/Theme.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:backgroundDimAmount">0.6</item>
+    </style>
+
+
+    <!--<style name="Theme.UMDialog" parent="android:style/Theme.Dialog">-->
+        <!--<item name="android:windowNoTitle">true</item>-->
+        <!--<item name="android:windowBackground">@android:color/transparent</item>-->
+    <!--</style>-->
+
+    <style name="Theme.UMDefault" parent="android:style/Theme.NoTitleBar"></style>
+
+    <!--<style name="umeng_socialize_divider">-->
+        <!--<item name="android:layout_width">fill_parent</item>-->
+        <!--<item name="android:layout_height">1dp</item>-->
+        <!--<item name="android:background">@color/umeng_socialize_divider</item>-->
+    <!--</style>-->
+
+    <!--<style name="umeng_socialize_list_item">-->
+        <!--<item name="android:layout_width">fill_parent</item>-->
+        <!--<item name="android:layout_height">55dp</item>-->
+        <!--<item name="android:background">@color/umeng_socialize_list_item_bgcolor</item>-->
+        <!--<item name="android:paddingBottom">5dp</item>-->
+        <!--<item name="android:paddingTop">5dp</item>-->
+    <!--</style>-->
+
+    <!--<style name="umeng_socialize_edit_padding">-->
+        <!--<item name="android:layout_width">fill_parent</item>-->
+        <!--<item name="android:layout_height">fill_parent</item>-->
+        <!--<item name="android:background">@color/umeng_socialize_list_item_bgcolor</item>-->
+        <!--<item name="android:layout_marginLeft">6dp</item>-->
+        <!--<item name="android:layout_marginRight">6dp</item>-->
+        <!--<item name="android:layout_marginTop">6dp</item>-->
+        <!--<item name="android:layout_marginBottom">6dp</item>-->
+    <!--</style>-->
+
+
+</resources>