Ver código fonte

Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

# Conflicts:
#	.idea/gradle.xml
#	app/build.gradle
#	app/libs/umeng_shareboard_widget.jar
#	app/libs/umeng_social_api.jar
#	app/libs/umeng_social_net.jar
#	app/libs/umeng_social_shareboard.jar
#	app/libs/umeng_social_tool.jar
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/sheep/jiuyan/samllsheep/BaseApplication.java
#	app/src/main/res/layout/umeng_socialize_oauth_dialog.xml
#	app/src/main/res/values/umeng_socialize_colors.xml
#	app/src/main/res/values/umeng_socialize_style.xml
zengjiebin 8 anos atrás
pai
commit
9bd88c04e3

BIN
app/libs/SocialSDK_QQ_Full.jar


BIN
app/libs/SocialSDK_WeiXin_Full.jar


BIN
app/libs/open_sdk_r5923_lite.jar


BIN
app/libs/umeng_shareboard_widget.jar


BIN
app/libs/umeng_social_api.jar


BIN
app/libs/umeng_social_net.jar


BIN
app/libs/umeng_social_shareboard.jar


BIN
app/libs/umeng_social_tool.jar


BIN
app/libs/wechat-sdk-android-with-mta-1.1.6.jar


+ 0 - 3
app/src/main/java/com/sheep/gamegroup/presenter/PhonePresenter.java

@@ -84,7 +84,6 @@ public class PhonePresenter implements PhoneContract.Presenter {
         com.alibaba.fastjson.JSONObject m = new com.alibaba.fastjson.JSONObject();
         m.put("account",telphone);
         m.put("sec_code",code);
-
         apiService.loginByCaptcha(m)
                 .subscribeOn(Schedulers.io())
                 .subscribe(new Observer<BaseMessage>() {
@@ -102,8 +101,6 @@ public class PhonePresenter implements PhoneContract.Presenter {
 
                     @Override
                     public void onNext(BaseMessage jsonObject) {
-//                        Log.e("onNext--------","onNext:"+jsonObject.toString());
-
                         view.returnLogindata(jsonObject);
 
                     }

+ 11 - 0
app/src/main/java/com/sheep/gamegroup/umeng/UMLogin.java

@@ -0,0 +1,11 @@
+package com.sheep.gamegroup.umeng;
+
+/**
+ * Created by Administrator on 2018/3/19.
+ */
+
+public class UMLogin {
+
+
+
+}

+ 24 - 0
app/src/main/java/com/sheep/gamegroup/util/StringUtils.java

@@ -0,0 +1,24 @@
+package com.sheep.gamegroup.util;
+
+import android.content.Context;
+import android.text.ClipboardManager;
+
+/**
+ * Created by Administrator on 2018/3/19.
+ */
+
+public class StringUtils {
+    /**
+     * 拷贝文字到粘贴板
+     * @param context
+     * @param text
+     */
+    public static void  CopyText(Context context,String  text){
+        ClipboardManager cm = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+        cm.setText(text);
+    }
+
+
+
+
+}

+ 132 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/AskGetMoneyAct.java

@@ -0,0 +1,132 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.umeng.socialize.ShareAction;
+import com.umeng.socialize.UMShareListener;
+import com.umeng.socialize.bean.SHARE_MEDIA;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+/**
+ * Created by Administrator on 2018/3/19.
+ */
+
+public class AskGetMoneyAct extends BaseActivity  implements UMShareListener {
+
+
+    @BindView(R.id.tv_size)
+    TextView tvSize;
+    @BindView(R.id.tv_money)
+    TextView tvMoney;
+    @BindView(R.id.rl_wx)
+    RelativeLayout rlWx;
+    @BindView(R.id.rl_qq)
+    RelativeLayout rlQq;
+    @BindView(R.id.rl_qr)
+    RelativeLayout rlQr;
+    @BindView(R.id.rl_link)
+    RelativeLayout rlLink;
+
+    /**
+     * 分享的链接地址
+     */
+    private  String  mShareLink;
+    @Override
+    protected int getLayoutId() {
+        return R.layout.x_ask_getmoney_act_layout;
+    }
+
+    @Override
+    public void initView() {
+
+    }
+
+    @Override
+    public void initListener() {
+
+    }
+
+    @Override
+    public void initData() {
+
+    }
+
+
+    @OnClick({R.id.rl_wx, R.id.rl_qq, R.id.rl_qr, R.id.rl_link})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.rl_wx:
+                shareToWX();
+                break;
+            case R.id.rl_qq:
+                shareToQQ();
+                break;
+            case R.id.rl_qr:
+                shareToQR();
+                break;
+            case R.id.rl_link:
+                shareToLink();
+                break;
+        }
+    }
+
+    private  void  shareToWX(){
+        new ShareAction(AskGetMoneyAct.this)
+                .setPlatform(SHARE_MEDIA.WEIXIN)//传入平台
+                .withText(mShareLink)//分享内容
+                .setCallback(this)//回调监听器
+                .share();
+
+    }
+
+
+    private  void  shareToQQ(){
+        new ShareAction(AskGetMoneyAct.this)
+                .setPlatform(SHARE_MEDIA.QQ)//传入平台
+                .withText(mShareLink)//分享内容
+                .setCallback(this)//回调监听器
+                .share();
+
+    }
+
+
+    private  void  shareToQR(){
+
+
+    }
+
+
+    private  void  shareToLink(){
+
+
+    }
+
+
+    @Override
+    public void onStart(SHARE_MEDIA share_media) {
+
+    }
+
+    @Override
+    public void onResult(SHARE_MEDIA share_media) {
+
+    }
+
+    @Override
+    public void onError(SHARE_MEDIA share_media, Throwable throwable) {
+
+    }
+
+    @Override
+    public void onCancel(SHARE_MEDIA share_media) {
+
+    }
+}

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/AskRewardAct.java

@@ -12,7 +12,7 @@ public class AskRewardAct extends BaseActivity {
 
     @Override
     protected int getLayoutId() {
-        return R.layout.xask_getmoney_act_layout;
+        return R.layout.x_ask_getmoney_act_layout;
     }
 
     @Override

+ 63 - 5
app/src/main/java/com/sheep/gamegroup/view/activity/LoginAct.java

@@ -1,11 +1,15 @@
 package com.sheep.gamegroup.view.activity;
 
+import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.res.Resources;
+import android.os.Build;
 import android.os.Bundle;
+import android.support.v4.app.ActivityCompat;
 import android.view.View;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.sheep.gamegroup.di.components.DaggerLoginComponent;
 import com.sheep.gamegroup.di.components.LoginComponent;
@@ -17,6 +21,13 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.page.MainActivity;
 import com.sheep.jiuyan.samllsheep.wxapi.WXEntryActivity;
+import com.umeng.socialize.UMAuthListener;
+import com.umeng.socialize.UMShareAPI;
+import com.umeng.socialize.bean.SHARE_MEDIA;
+import com.umeng.socialize.utils.SocializeUtils;
+import com.uuzuche.lib_zxing.decoding.Intents;
+
+import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -47,10 +58,26 @@ public class LoginAct extends BaseActivity implements LoginContract.View{
                 .loginModule(new LoginModule(this))
                 .build()
         .inject(this);
-        ButterKnife.bind(this);
         setTvBg(R.id.weixin_login_tv);
     }
 
+
+    private  void  requestPremiss(){
+        if(Build.VERSION.SDK_INT>=23){
+            String[] mPermissionList = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.ACCESS_FINE_LOCATION,Manifest.permission.CALL_PHONE,Manifest.permission.READ_LOGS,Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.SET_DEBUG_APP,Manifest.permission.SYSTEM_ALERT_WINDOW,Manifest.permission.GET_ACCOUNTS,Manifest.permission.WRITE_APN_SETTINGS};
+            ActivityCompat.requestPermissions(this,mPermissionList,123);
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode,
+                                           String permissions[], int[] grantResults) {
+
+
+    }
+
+
+
     @Override
     public void initListener() {
 
@@ -58,7 +85,7 @@ public class LoginAct extends BaseActivity implements LoginContract.View{
 
     @Override
     public void initData() {
-
+        requestPremiss();
     }
 
 
@@ -76,6 +103,9 @@ public class LoginAct extends BaseActivity implements LoginContract.View{
         }
     }
 
+
+
+
     private void goTelLogin() {
         Intent intent = new Intent(activity, PhoneAct.class);
         startActivity(intent);
@@ -83,9 +113,37 @@ public class LoginAct extends BaseActivity implements LoginContract.View{
     }
 
     private void goWeixin() {
-        Intent intent = new Intent(activity, WXEntryActivity.class);
-        startActivity(intent);
-//        finish();
+        UMShareAPI.get(this).doOauthVerify(this, SHARE_MEDIA.WEIXIN, new UMAuthListener() {
+            @Override
+            public void onStart(SHARE_MEDIA platform) {
+
+            }
+
+            @Override
+            public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
+
+            }
+
+            @Override
+            public void onError(SHARE_MEDIA platform, int action, Throwable t) {
+
+            }
+
+            @Override
+            public void onCancel(SHARE_MEDIA platform, int action) {
+
+
+
+            }
+        });
+
+    }
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+
+
     }
 
     /**

+ 11 - 0
app/src/main/java/com/sheep/jiuyan/samllsheep/BaseApplication.java

@@ -4,6 +4,9 @@ import android.app.Application;
 import android.support.multidex.MultiDexApplication;
 
 import com.kfzs.duanduan.KFZSApp;
+import com.umeng.commonsdk.UMConfigure;
+import com.umeng.socialize.PlatformConfig;
+import com.umeng.socialize.UMShareAPI;
 import com.uuzuche.lib_zxing.activity.ZXingLibrary;
 
 import org.xutils.BuildConfig;
@@ -21,5 +24,13 @@ public class BaseApplication extends KFZSApp {
         x.Ext.init(this);
         x.Ext.setDebug(BuildConfig.DEBUG); // 是否输出debug日志, 开启debug会影响性能.
         ZXingLibrary.initDisplayOpinion(this);
+        UMConfigure.setLogEnabled(true);
+        UMConfigure.init(this, UMConfigure.DEVICE_TYPE_PHONE, "5ab0a1da8f4a9d742900035f");
+
+        UMShareAPI.get(this);
+        PlatformConfig.setWeixin("wxdc1e388c3822c80b", "3baf1193c85774b3fd9d18447d76cab0");
+        PlatformConfig.setQQZone("100424468", "c7394704798a158208a74ab60104f0ba");
+
+
     }
 }

+ 2 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/base/BaseActivity.java

@@ -32,10 +32,11 @@ public abstract class BaseActivity extends AppActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(getLayoutId());
+        ButterKnife.bind(this);
         initView();
         initListener();
         initData();
-//        ButterKnife.bind(this);
+
     }
 
     protected void  showProgress(){

+ 2 - 94
app/src/main/java/com/sheep/jiuyan/samllsheep/wxapi/WXEntryActivity.java

@@ -1,99 +1,7 @@
 package com.sheep.jiuyan.samllsheep.wxapi;
+import com.umeng.socialize.weixin.view.WXCallbackActivity;
 
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.tencent.mm.opensdk.constants.ConstantsAPI;
-import com.tencent.mm.opensdk.modelbase.BaseReq;
-import com.tencent.mm.opensdk.modelbase.BaseResp;
-import com.tencent.mm.opensdk.modelmsg.SendAuth;
-import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler;
+public class WXEntryActivity extends WXCallbackActivity {
 
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.widget.Toast;
 
-
-public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
-
-    Context mContext;
-    private String TAG = "WXEntryActivity";
-    private static final int RETURN_MSG_TYPE_LOGIN = 1; //登录
-    private static final int RETURN_MSG_TYPE_SHARE = 2; //分享
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mContext = this;
-        //注意:
-        //第三方开发者如果使用透明界面来实现WXEntryActivity,需要判断handleIntent的返回值,如果返回值为false,则说明入参不合法未被SDK处理,应finish当前透明界面,避免外部通过传递非法参数的Intent导致停留在透明界面,引起用户的疑惑
-        try {
-            boolean ok = SheepApp.mWxapi.handleIntent(getIntent(), this);
-            if (!ok) {
-                finish();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-
-        setIntent(intent);
-        SheepApp.mWxapi.handleIntent(intent, this);
-    }
-
-    // 微信发送请求到第三方应用时,会回调到该方法
-    @Override
-    public void onReq(BaseReq req) {
-        switch (req.getType()) {
-            case ConstantsAPI.COMMAND_GETMESSAGE_FROM_WX:
-                break;
-            case ConstantsAPI.COMMAND_SHOWMESSAGE_FROM_WX:
-                break;
-            default:
-                break;
-        }
-    }
-
-    // 第三方应用发送到微信的请求处理后的响应结果,会回调到该方法
-    @Override
-    public void onResp(BaseResp baseResp) {
-        Toast.makeText(this, "baseresp.getType = " + baseResp.getType(), Toast.LENGTH_SHORT).show();
-        Log.e(TAG, "error_code:---->" + baseResp.errCode);
-        int type = baseResp.getType(); //类型:分享还是登录
-        switch (baseResp.errCode) {
-            case BaseResp.ErrCode.ERR_AUTH_DENIED:
-                //用户拒绝授权
-                Toast.makeText(mContext, "拒绝授权微信登录", Toast.LENGTH_SHORT).show();
-            case BaseResp.ErrCode.ERR_USER_CANCEL:
-                //用户取消
-                String message = "";
-                if (type == RETURN_MSG_TYPE_LOGIN) {
-                    message = "取消了微信登录";
-                } else if (type == RETURN_MSG_TYPE_SHARE) {
-                    message = "取消了微信分享";
-                }
-                Toast.makeText(mContext, message, Toast.LENGTH_SHORT).show();
-                break;
-            case BaseResp.ErrCode.ERR_OK:
-                //用户同意
-                if (type == RETURN_MSG_TYPE_LOGIN) {
-                    //用户换取access_token的code,仅在ErrCode为0时有效
-                    String code = ((SendAuth.Resp) baseResp).code;
-                    Log.e(TAG, "code:------>" + code);
-                    System.out.print(code + "--------------");
-
-                    //这里拿到了这个code,去做2次网络请求获取access_token和用户个人信息
-//                    WXLoginUtils().getWXLoginResult(code, this);
-
-                } else if (type == RETURN_MSG_TYPE_SHARE) {
-                    Toast.makeText(mContext, "微信分享成功", Toast.LENGTH_SHORT).show();
-                }
-                break;
-        }
-    }
 }

+ 1 - 0
app/src/main/res/layout/umeng_socialize_oauth_dialog.xml

@@ -24,6 +24,7 @@
             android:id="@+id/umeng_back"
             android:layout_width="60dp"
             android:layout_height="match_parent"
+
             android:onClick="onCancel"
             android:visibility="visible">
 

+ 5 - 0
app/src/main/res/layout/xask_getmoney_act_layout.xml

@@ -220,6 +220,7 @@
             >
 
         <TextView
+
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="@dimen/text_size_25"
@@ -300,6 +301,7 @@
             android:layout_marginBottom="10dp"
             />
        <RelativeLayout
+           android:id="@+id/rl_wx"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="10dp"
@@ -349,6 +351,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:layout_marginBottom="10dp"
+            android:id="@+id/rl_qq"
             >
             <ImageView
                 android:id="@+id/iv_qq"
@@ -395,6 +398,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:layout_marginBottom="10dp"
+            android:id="@+id/rl_qr"
             >
             <ImageView
                 android:id="@+id/iv_qr"
@@ -442,6 +446,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:layout_marginBottom="10dp"
+            android:id="@+id/rl_link"
             >
             <ImageView
                 android:id="@+id/iv_link"

+ 16 - 16
app/src/main/res/values/umeng_socialize_colors.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?><resources>
-    <color name="umeng_socialize_comments_bg">#F4F4F4</color>
-    <color name="umeng_socialize_color_group">#2c3035</color>
-	<color name="umeng_socialize_list_item_textcolor">#333333</color>
-	<color name="umeng_socialize_list_item_bgcolor">#FFFFFF</color>
-	<color name="umeng_socialize_divider">#E6E6E6</color>
-	<color name="umeng_socialize_text_time">#999999</color>
-	<color name="umeng_socialize_text_title">#464f61</color>
-	<color name="umeng_socialize_text_friends_list">#959696</color>
-	<color name="umeng_socialize_text_share_content">#666666</color>
-	<color name="umeng_socialize_ucenter_bg">#EEEEEE</color>
-	<color name="umeng_socialize_text_ucenter">#595959</color>
-	<color name="umeng_socialize_edit_bg">#C4C4C4</color>
-	<color name="umeng_socialize_grid_divider_line">#F8F8F8</color>
-	<color name="umeng_socialize_web_bg">#F4F4F4</color>
-	<color name="umeng_socialize_shareactivity">#D4E0E5</color>
-	<color name="umeng_socialize_shareactivitydefault">#ffffff</color>
+
+
+
+	<!--<color name="umeng_socialize_list_item_bgcolor">#FFFFFF</color>-->
+	<!--<color name="umeng_socialize_divider">#E6E6E6</color>-->
+	<!--<color name="umeng_socialize_text_time">#999999</color>-->
+	<!--<color name="umeng_socialize_text_title">#464f61</color>-->
+	<!--<color name="umeng_socialize_text_friends_list">#959696</color>-->
+	<!--<color name="umeng_socialize_text_share_content">#666666</color>-->
+	<!--<color name="umeng_socialize_ucenter_bg">#EEEEEE</color>-->
+	<!--<color name="umeng_socialize_text_ucenter">#595959</color>-->
+	<!--<color name="umeng_socialize_edit_bg">#C4C4C4</color>-->
+	<!--<color name="umeng_socialize_grid_divider_line">#F8F8F8</color>-->
+	<!--<color name="umeng_socialize_web_bg">#F4F4F4</color>-->
+	<!--<color name="umeng_socialize_shareactivity">#D4E0E5</color>-->
+	<!--<color name="umeng_socialize_shareactivitydefault">#ffffff</color>-->
 </resources>

+ 57 - 65
app/src/main/res/values/umeng_socialize_style.xml

@@ -1,40 +1,40 @@
 <?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="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_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>
@@ -47,44 +47,36 @@
     </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.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_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_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>
-    
-    <style name="mine_interval">
-        <item name="android:layout_marginLeft">8dp</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="TablLayoutTextStyle">
-        <item name="android:textSize">14sp</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>