Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

WeiChat/src/main/java/com/sk/weichat/ui/MainActivity.java

@@ -125,6 +125,28 @@ public class MainActivity extends BaseActivity implements NetWorkObserver, AuthS
 		}
 	};
 	private int mImStatus = AuthStateListener.AUTH_STATE_NOT;
+
+	// TODO 百度推送关闭打开广播接收
+	public static  String BAIDU_PUSH="BAIDUOUSH";
+	public static  String BAIDU_PUSH_RECEIVER="BAIDUOUSH";
+
+	private BroadcastReceiver baiduPushReceiver=new BroadcastReceiver(){
+		@Override
+		public void onReceive(Context context, Intent intent) {
+			Log.i("gongpengming","接收到广播");
+			if (BAIDU_PUSH_RECEIVER.equals(intent.getAction())){
+				boolean isPush=intent.getBooleanExtra(BAIDU_PUSH_RECEIVER,true);
+				Log.i("gongpengming","接收到广播"+isPush);
+				if (isPush){
+					PushManager.resumeWork(MainActivity.this);
+					PushManager.bind(MainActivity.this,1);
+				}else{
+					PushManager.stopWork(MainActivity.this);
+					PushManager.unbind(MainActivity.this);
+				}
+			}
+		}
+	};
 	private ServiceConnection mXmppServiceConnection = new ServiceConnection() {
 		@Override
 		public void onServiceDisconnected(ComponentName name) {
@@ -169,6 +191,7 @@ public class MainActivity extends BaseActivity implements NetWorkObserver, AuthS
 				if (mWorksFragment == null) {
 					mWorksFragment= new WorksFragment();
 				}
+				mWorksFragment.onClickFragment();
 				changeFragment(mWorksFragment, TAG_NEARBY);//附近
 				getSupportActionBar().setTitle(R.string.nearby);
 			}
@@ -292,6 +315,7 @@ public class MainActivity extends BaseActivity implements NetWorkObserver, AuthS
 			mXmppService = ((CoreServiceBinder) service).getService();
 		}
 	};
+	private IntentFilter fiter;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -300,14 +324,24 @@ public class MainActivity extends BaseActivity implements NetWorkObserver, AuthS
 		getSupportActionBar().setDisplayHomeAsUpEnabled(false);
 		/**@注释：主页布局文件 */
 		setContentView(R.layout.activity_main);
+		//注册百度推送广播接收
+		fiter = new IntentFilter();
+		fiter.setPriority(1000);
+		fiter.addAction(BAIDU_PUSH_RECEIVER);
+		registerReceiver(baiduPushReceiver, fiter);
+
 		SIP_USERNAME= MyApplication.getInstance().mLoginUser.getUserId();
 		String host=mConfig.MeetingHost;
 		SIP_DOMAIN= host ==null ?"120.24.211.24":host;
 		SIP_SERVER_HOST=host ==null ?"120.24.211.24":host;
 		 Log.i("wang","token:"+ MyApplication.getInstance().mAccessToken);
 		 Log.i("wang","usId:"+ MyApplication.getInstance().mLoginUser.getUserId());
-		//百度推送
+		//TODO 百度开始推送
 		PushManager.startWork(getApplicationContext(), PushConstants.LOGIN_TYPE_API_KEY, "iF9q4ruTpFwQ9x8pY6Edqm9G");
+		if (PreferenceUtils.getBoolean(MyApplication.getInstance(),BAIDU_PUSH)) {
+			PushManager.stopWork(this);
+			PushManager.unbind(this);
+		}
 		mActivityManager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
 		if (savedInstanceState != null) {
 			restoreState(savedInstanceState);
@@ -462,7 +496,9 @@ public class MainActivity extends BaseActivity implements NetWorkObserver, AuthS
 		}
 		unregisterReceiver(mUpdateUnReadReceiver);
 		unregisterReceiver(mUserLogInOutReceiver);
+		unregisterReceiver(baiduPushReceiver);
 		screenListener.unregisterListener();
+		//移除广播接收
 		super.onDestroy();
 	}
 

WeiChat/src/main/java/com/sk/weichat/ui/circle/BusinessCircleActivity.java

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -15,6 +16,7 @@ import android.widget.ImageView;
 import android.widget.ListView;
 
 import com.alibaba.fastjson.JSON;
+import com.android.volley.Response;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
@@ -27,6 +29,7 @@ import com.sk.weichat.MyApplication;
 import com.sk.weichat.R;
 import com.sk.weichat.adapter.PublicMessageAdapter;
 import com.sk.weichat.bean.MyPhoto;
+import com.sk.weichat.bean.circle.CircleMessage;
 import com.sk.weichat.bean.circle.Comment;
 import com.sk.weichat.bean.circle.PublicMessage;
 import com.sk.weichat.db.dao.CircleMessageDao;
@@ -36,6 +39,7 @@ import com.sk.weichat.helper.AvatarHelper;
 import com.sk.weichat.helper.FileDataHelper;
 import com.sk.weichat.ui.base.BaseActivity;
 import com.sk.weichat.ui.tool.MultiImagePreviewActivity;
+import com.sk.weichat.util.PreferenceUtils;
 import com.sk.weichat.util.ToastUtil;
 import com.sk.weichat.view.CarouselImageView;
 import com.sk.weichat.view.PMsgBottomView;
@@ -431,12 +435,59 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView{
 	}
 
 	private void requestMyBusiness(final boolean isPullDwonToRefersh) {
+
 		if (isPullDwonToRefersh) {
 			mPageIndex = 0;
 		}
+		HashMap<String, String> params = new HashMap<String, String>();
+		String messageId = null;
+		if (!isPullDwonToRefersh && mMessages.size() > 0) {
+			messageId = mMessages.get(mMessages.size() - 1).getMessageId();
+			params.put("messageId",messageId);
+		}
+		params.put("access_token", MyApplication.getInstance().mAccessToken);
+		params.put("pageSize", ""+10);
+		params.put("type", "0");
+		StringJsonArrayRequest<PublicMessage> request = new StringJsonArrayRequest<PublicMessage>(
+				mConfig.MSG_LIST, new Response.ErrorListener() {
+			@Override
+			public void onErrorResponse(VolleyError arg0) {
+				Log.i("gongpengmingTIME", "" + arg0.getMessage());
+				ToastUtil.showErrorNet(BusinessCircleActivity.this);
+			}
+		}, new StringJsonArrayRequest.Listener<PublicMessage>() {
+			@Override
+			public void onResponse(ArrayResult<PublicMessage> result) {
+				boolean success = Result.defaultParser(mContext, result, true);
+				if (success) {
+					List<PublicMessage> datas = result.getData();
+					if (isPullDwonToRefersh) {
+						mMessages.clear();
+					}
+					if (datas != null && datas.size() > 0) {// 没有更多数据
+						mPageIndex++;
+						if ( isPullDwonToRefersh) {
+							FileDataHelper.writeFileData(BusinessCircleActivity.this, mLoginUserId, FileDataHelper.FILE_BUSINESS_CIRCLE, result);
+						}
+						mMessages.addAll(datas);
+					}
+					mAdapter.notifyDataSetChanged();
 
-		List<String> msgIds = CircleMessageDao.getInstance().getCircleMessageIds(mLoginUserId, mPageIndex, AppConfig.PAGE_SIZE);
+				} else {
 
+				}
+				mPullToRefreshListView.onRefreshComplete();
+			}
+		}, PublicMessage.class, params);
+		addDefaultRequest(request);
+	}
+	//TODO 接口错误，后期整合如无用删除
+	private void requestMyBusiness(final boolean isPullDwonToRefersh,int i) {
+		Log.i("gongpengming","请求网络"+isPullDwonToRefersh);
+		if (isPullDwonToRefersh) {
+			mPageIndex = 0;
+		}
+		List<String> msgIds = CircleMessageDao.getInstance().getCircleMessageIds(mLoginUserId, mPageIndex, AppConfig.PAGE_SIZE);
 		if (msgIds == null || msgIds.size() <= 0) {
 			mPullToRefreshListView.onRefreshComplete(200);
 			return;

WeiChat/src/main/java/com/sk/weichat/ui/circle/BusinessCircleFragment.java

@@ -207,9 +207,11 @@ public class BusinessCircleFragment extends EasyFragment implements showCEView {
 		return mLoginUserId.equals(mUserId);
 	}
 	private void downloadCircleMessage() {
+
 		HashMap<String, String> params = new HashMap<String, String>();
 		params.put("access_token", MyApplication.getInstance().mAccessToken);
 		final BaseActivity mContext= (BaseActivity) getActivity();
+
 		StringJsonArrayRequest<CircleMessage> request = new StringJsonArrayRequest<CircleMessage>(
 				(mContext.mConfig).MSG_LIST, new ErrorListener() {
 			@Override

WeiChat/src/main/java/com/sk/weichat/ui/erp/fragment/WorksFragment.java

@@ -1,21 +1,45 @@
 package com.sk.weichat.ui.erp.fragment;
 
 import android.app.Activity;
+import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.RelativeLayout;
 
+import com.alibaba.fastjson.JSON;
+import com.android.volley.Response;
+import com.android.volley.VolleyError;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.sk.weichat.AppConfig;
 import com.sk.weichat.AppConstant;
+import com.sk.weichat.MyApplication;
 import com.sk.weichat.R;
+import com.sk.weichat.bean.circle.CircleMessage;
+import com.sk.weichat.bean.circle.PublicMessage;
+import com.sk.weichat.db.dao.CircleMessageDao;
+import com.sk.weichat.db.dao.OnCompleteListener;
+import com.sk.weichat.helper.FileDataHelper;
+import com.sk.weichat.ui.base.BaseActivity;
 import com.sk.weichat.ui.base.XutilsFragment;
 import com.sk.weichat.ui.circle.BusinessCircleActivity;
 import com.sk.weichat.ui.erp.activity.CommonFragmentActivity;
 import com.sk.weichat.ui.erp.activity.CompanyContactsActivity;
 import com.sk.weichat.ui.erp.activity.ErpMenActivity;
+import com.sk.weichat.util.PreferenceUtils;
+import com.sk.weichat.util.ToastUtil;
+import com.sk.weichat.volley.ArrayResult;
+import com.sk.weichat.volley.FastVolley;
+import com.sk.weichat.volley.Result;
+import com.sk.weichat.volley.StringJsonArrayRequest;
+
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * @desc:工作
@@ -23,13 +47,20 @@ import com.sk.weichat.ui.erp.activity.ErpMenActivity;
  */
 public class WorksFragment extends XutilsFragment implements View.OnClickListener {
 
+    private static final String HASHCODE = "WorksFragment";
+    private static final String TIME_MILL = "TIMEMILL";
     private String TAG = "WorksFragment";
     private Context ct;
     private LayoutInflater mInflater;
+    @ViewInject(R.id.iv_remain)
+    private ImageView iv_remain;
     @ViewInject(R.id.rl_uas_sys)
     private RelativeLayout rl_uas_sys;
     @ViewInject(R.id.my_friend_rl)
     private RelativeLayout my_friend_rl;
+    private FastVolley mFastVolley = MyApplication.getInstance().getFastVolley();
+    private AppConfig config;
+    private String mLoginUserId;
 
     @Override
     protected int inflateLayoutId() {
@@ -38,6 +69,7 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
 
     @Override
     protected void onCreateView(Bundle savedInstanceState, boolean createView) {
+
         if (createView) {
             ct = getActivity();
             mInflater = (LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
@@ -57,6 +89,7 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
                 ct.startActivity(new Intent(ct, ErpMenActivity.class));
                 break;
             case R.id.my_friend_rl:
+                iv_remain.setVisibility(View.GONE);
                 Intent intent = new Intent(getActivity(), BusinessCircleActivity.class);
                 intent.putExtra(AppConstant.EXTRA_CIRCLE_TYPE, AppConstant.CIRCLE_TYPE_MY_BUSINESS);
                 startActivity(intent);
@@ -65,4 +98,53 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
         }
     }
 
+    public void onClickFragment() {
+        requestMyBusiness();
+    }
+
+    private void requestMyBusiness() {
+        if (config == null) {
+            config = MyApplication.getInstance().getConfig();
+        }
+        if (mLoginUserId == null || mLoginUserId.length() <= 0) {
+            mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
+        }
+        HashMap<String, String> params = new HashMap<String, String>();
+        params.put("access_token", MyApplication.getInstance().mAccessToken);
+        final BaseActivity mContext = (BaseActivity) getActivity();
+        StringJsonArrayRequest<CircleMessage> request = new StringJsonArrayRequest<CircleMessage>(
+                config.MSG_LIST, new Response.ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError arg0) {
+                ToastUtil.showErrorNet(getActivity());
+            }
+        }, new StringJsonArrayRequest.Listener<CircleMessage>() {
+            @Override
+            public void onResponse(ArrayResult<CircleMessage> result) {
+                boolean success = Result.defaultParser(mContext, result, true);
+                if (success) {
+                    List<CircleMessage> datas = result.getData();
+                    if (datas != null && datas.size() > 0) { // 没有更多数据
+                        FileDataHelper.writeFileData(getActivity(), mLoginUserId, FileDataHelper.FILE_BUSINESS_CIRCLE, result);
+                        if (datas.get(0).getTime() > 0) {
+                            long time = PreferenceUtils.getLong(getActivity(), TIME_MILL);
+                            if (time != datas.get(0).getTime()) {
+                                PreferenceUtils.putLong(getActivity(), TIME_MILL, datas.get(0).getTime());
+                                iv_remain.setVisibility(View.VISIBLE);
+                            } else {
+                                iv_remain.setVisibility(View.GONE);
+                            }
+                        }
+                    }
+
+                } else {
+
+                }
+            }
+        }, CircleMessage.class, params);
+        if (mFastVolley == null) {
+            mFastVolley = MyApplication.getInstance().getFastVolley();
+        }
+        mFastVolley.addDefaultRequest(HASHCODE, request);
+    }
 }

WeiChat/src/main/java/com/sk/weichat/ui/me/MeFragment.java

@@ -203,10 +203,15 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         int id = v.getId();
         switch (id) {
             case R.id.rl_company_change:
-                Log.i("LoginApp","手机号："+MyApplication.getInstance().mLoginUser.getTelephone() );
-                Log.i("LoginApp","密码："+ CommonUtil.getSharedPreferences(ct,"user_password"));
+//                    Log.i("LoginApp","手机号："+MyApplication.getInstance().mLoginUser.getTelephone() );
+//                    Log.i("LoginApp","密码："+ CommonUtil.getSharedPreferences(ct,"user_password"));
+
+                String commpany=CommonUtil.getSharedPreferences(ct,"erp_commpany");
+
                 com.sk.weichat.ui.erp.net.ViewUtil.LoginTask(MyApplication.getInstance().mLoginUser.getTelephone()
                         , CommonUtil.getSharedPreferences(ct,"user_password"), ct);
+
+
                 break;
             case R.id.rl_master_change:
                  changeMaster();

WeiChat/src/main/java/com/sk/weichat/ui/me/SettingActivity.java

@@ -6,20 +6,27 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.RadioButton;
 import android.widget.TextView;
 
+import com.baidu.android.pushservice.PushManager;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.sk.weichat.MyApplication;
 import com.sk.weichat.R;
 import com.sk.weichat.helper.LoginHelper;
 import com.sk.weichat.sp.UserSp;
+import com.sk.weichat.ui.MainActivity;
 import com.sk.weichat.ui.base.ActionBackActivity;
 import com.sk.weichat.ui.erp.util.CommonUtil;
 import com.sk.weichat.ui.tool.WebViewActivity;
 import com.sk.weichat.util.GetFileSizeUtil;
+import com.sk.weichat.util.PreferenceUtils;
 import com.sk.weichat.util.ToastUtil;
 
 import java.io.File;
@@ -32,7 +39,8 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
 	private TextView mCacheTv;
     @ViewInject(R.id.uas_website_tv)
 	private TextView uas_website_tv;
-
+	private String IS_CLICKED="CLICKED";
+	private CheckBox close_push_rb;
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -45,6 +53,36 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
 
 	private void initView() {
 		mExitBtn = (Button) findViewById(R.id.exit_btn);
+		close_push_rb= (CheckBox) findViewById(R.id.close_push_rb);
+		if (PreferenceUtils.getBoolean(MyApplication.getInstance(),IS_CLICKED)){
+			close_push_rb.setChecked(true);
+		}else{
+			close_push_rb.setChecked(PreferenceUtils.getBoolean(MyApplication.getInstance(),MainActivity.BAIDU_PUSH));
+		}
+		close_push_rb.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+			@Override
+			public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
+				if (!PreferenceUtils.getBoolean(MyApplication.getInstance(),IS_CLICKED)){
+					PreferenceUtils.putBoolean(MyApplication.getInstance(),IS_CLICKED,true);
+				}
+				Intent intent=new Intent();
+				if(b){
+					Log.i("gongpengming","打开推送");
+					PreferenceUtils.putBoolean(MyApplication.getInstance(),MainActivity.BAIDU_PUSH,true);
+					intent.putExtra(MainActivity.BAIDU_PUSH_RECEIVER,true);
+					intent.setAction(MainActivity.BAIDU_PUSH_RECEIVER);
+					SettingActivity.this.sendBroadcast(intent);
+
+				}else{
+					PreferenceUtils.putBoolean(MyApplication.getInstance(),MainActivity.BAIDU_PUSH,false);
+					intent.putExtra(MainActivity.BAIDU_PUSH_RECEIVER,false);
+					intent.setAction(MainActivity.BAIDU_PUSH_RECEIVER);
+					SettingActivity.this.sendBroadcast(intent);
+					Log.i("gongpengming","关闭推送");
+
+				}
+			}
+		});
 		mExitBtn.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {

WeiChat/src/main/java/com/sk/weichat/ui/message/ChatActivity.java

@@ -866,7 +866,6 @@ public class ChatActivity extends ActionBackActivity
             }
         } else if (requestCode == REQUEST_CODE_SELECT_CARD && resultCode == RESULT_OK) {//选择名片返回
             Friend card = (Friend) data.getSerializableExtra("card");
-
             ChatMessage message = new ChatMessage();
             message.setType(XmppMessage.TYPE_CARD);
             message.setFromUserName(card.getNickName());
@@ -952,6 +951,8 @@ public class ChatActivity extends ActionBackActivity
         //http://192.168.253.244:8092/tigase/notify
         String url = "http://113.105.74.140:8092/tigase/notify";
         Map<String, Object> params = new HashMap<String, Object>();
+//        int[] str;
+//        params.put("text", str);
         params.put("from", from);
         params.put("to", to);
         params.put("body", body);

WeiChat/src/main/java/com/sk/weichat/util/PreferenceUtils.java

@@ -59,8 +59,6 @@ public class PreferenceUtils {
 	}
 	/**
 	 * 存储String的数据*/
-	
-	
 	public static void putString(Context context,String key,String value){
 		SharedPreferences sp = getPreferences(context);
 		Editor edit=sp.edit();

WeiChat/src/main/res/layout/activity_setting.xml

@@ -2,17 +2,17 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+        android:layout_height="match_parent">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="10dp" >
+            android:padding="10dp">
 
 
             <!--公司-->
@@ -36,8 +36,8 @@
                     style="@style/IMTbleLine_TextValue"
                     android:layout_toLeftOf="@+id/uas_website_arrow_img"
                     android:layout_toRightOf="@+id/uas_website_text"
-                    android:textSize="12sp"
-                    android:textColor="@color/dark_dark_grey" />
+                    android:textColor="@color/dark_dark_grey"
+                    android:textSize="12sp" />
 
                 <ImageView
                     android:id="@+id/uas_website_arrow_img"
@@ -48,12 +48,36 @@
                     android:background="@drawable/set_list_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
+            <!--设置关闭推送-->
+            <RelativeLayout
+                android:id="@+id/close_push_rl"
+                style="@style/IMTbleLine_UP"
+                android:layout_marginTop="9dp">
 
+                <TextView
+                    android:id="@+id/push_setting_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="@string/push_setting"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+
+                <CheckBox
+                    android:id="@+id/close_push_rb"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:checked="true"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
             <!--清除缓存-->
             <RelativeLayout
                 android:id="@+id/clear_cache_rl"
                 style="@style/IMTbleLine_UP"
-                android:layout_marginTop="9dp" >
+                android:layout_marginTop="9dp">
 
                 <TextView
                     android:id="@+id/cache_text"
@@ -84,7 +108,7 @@
 
             <RelativeLayout
                 android:id="@+id/use_help_rl"
-                style="@style/IMTbleLine_UP" >
+                style="@style/IMTbleLine_UP">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -106,7 +130,7 @@
 
             <RelativeLayout
                 android:id="@+id/about_us_rl"
-                style="@style/IMTbleLine" >
+                style="@style/IMTbleLine">
 
                 <TextView
                     android:layout_width="wrap_content"

WeiChat/src/main/res/layout/fragment_works.xml

@@ -1,137 +1,147 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-android:layout_width="match_parent"
-android:layout_height="match_parent"
-android:background="@color/normal_bg">
-
-<LinearLayout
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="9dp">
-
-    <RelativeLayout
-        android:id="@+id/my_data_rl"
-        style="@style/IMTbleLine">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:drawableLeft="@drawable/set_resume"
-            android:drawablePadding="10dp"
-            android:gravity="center"
-            android:text="我的关注"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/set_list_next"
-            android:contentDescription="@string/app_name" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/my_friend_rl"
-        android:layout_marginTop="9dp"
-        style="@style/IMTbleLine_UP">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:drawableLeft="@drawable/set_fans"
-            android:drawablePadding="10dp"
-            android:gravity="center"
-            android:text="我的朋友圈"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/set_list_next"
-            android:contentDescription="@string/app_name" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/rl_uas_sys"
-        android:layout_marginTop="9dp"
-        style="@style/IMTbleLine">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:drawableLeft="@drawable/set_video"
-            android:drawablePadding="10dp"
-            android:gravity="center"
-            android:text="我的UAS"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/set_list_next"
-            android:contentDescription="@string/app_name" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/setting_rl"
-        style="@style/IMTbleLine"
-        android:layout_marginTop="9dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:drawableLeft="@drawable/title_set"
-            android:drawablePadding="10dp"
-            android:gravity="center"
-            android:text="优软商务"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/set_list_next"
-            android:contentDescription="@string/app_name" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/goods_find"
-        style="@style/IMTbleLine"
-        android:layout_marginTop="9dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:drawableLeft="@drawable/title_set"
-            android:drawablePadding="10dp"
-            android:gravity="center"
-            android:text="商品查询"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/set_list_next"
-            android:contentDescription="@string/app_name" />
-    </RelativeLayout>
-</LinearLayout>
+    android:layout_height="match_parent"
+    android:background="@color/normal_bg">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="9dp">
+
+        <RelativeLayout
+            android:id="@+id/my_data_rl"
+            style="@style/IMTbleLine">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:drawableLeft="@drawable/set_resume"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="我的关注"
+                android:textColor="@color/black"
+                android:textSize="14sp" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/set_list_next"
+                android:contentDescription="@string/app_name" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/my_friend_rl"
+            style="@style/IMTbleLine_UP"
+            android:layout_marginTop="9dp">
+
+            <TextView
+                android:id="@+id/tv_zone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:drawableLeft="@drawable/set_fans"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="我的朋友圈"
+                android:textColor="@color/black"
+                android:textSize="14sp" />
+
+            <ImageView
+                android:id="@+id/iv_remain"
+                android:layout_width="15dp"
+                android:layout_height="15dp"
+                android:layout_centerVertical="true"
+                android:layout_toRightOf="@+id/tv_zone"
+                android:src="@drawable/tab_unread_bg"
+                android:visibility="gone" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/set_list_next"
+                android:contentDescription="@string/app_name" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/rl_uas_sys"
+            style="@style/IMTbleLine"
+            android:layout_marginTop="9dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:drawableLeft="@drawable/set_video"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="我的UAS"
+                android:textColor="@color/black"
+                android:textSize="14sp" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/set_list_next"
+                android:contentDescription="@string/app_name" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/setting_rl"
+            style="@style/IMTbleLine"
+            android:layout_marginTop="9dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:drawableLeft="@drawable/title_set"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="优软商务"
+                android:textColor="@color/black"
+                android:textSize="14sp" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/set_list_next"
+                android:contentDescription="@string/app_name" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/goods_find"
+            style="@style/IMTbleLine"
+            android:layout_marginTop="9dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:drawableLeft="@drawable/title_set"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="商品查询"
+                android:textColor="@color/black"
+                android:textSize="14sp" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/set_list_next"
+                android:contentDescription="@string/app_name" />
+        </RelativeLayout>
+    </LinearLayout>
 
 </ScrollView>

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

@@ -284,6 +284,7 @@
     <string name="uas_callback">建议反馈</string>
 
     <string name="clear_cache">清除缓存</string>
+    <string name="push_setting">关闭推送</string>
     <string name="use_help">使用帮助</string>
     <string name="about_us">关于我们</string>
     <string name="exit_tips">确定要退出此账号吗？</string>

materialdialogs/src/main/java/com/afollestad/materialdialogs/MaterialDialogAdapter.java

@@ -5,6 +5,7 @@ import android.annotation.TargetApi;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.support.annotation.LayoutRes;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;