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

WeiChat/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 android {
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('C:/CompanyProject/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SubscriptionActivity.java

@@ -1,8 +1,8 @@
 package com.xzjmyk.pm.activity.ui.message;
 
 import android.app.AlertDialog;
+import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -11,11 +11,16 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.BaseAdapter;
+import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ListView;
+import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
@@ -29,6 +34,7 @@ import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.tool.ThreadPool;
+import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.util.LoadLocalImageUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
@@ -41,7 +47,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-
+/**
+ * 订阅号页面
+ */
 public class SubscriptionActivity extends BaseActivity {
     private static final int LOAD_NET = 0x15;
     private int requestCode = 0x01;
@@ -103,23 +111,76 @@ public class SubscriptionActivity extends BaseActivity {
         }
     };
 
+    private PopupWindow mSubscribeWindow;
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-//        getMenuInflater().inflate(R.menu.menu_subscription, menu);
+        getMenuInflater().inflate(R.menu.menu_subscribe, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case R.id.dingyue_select:
-                startActivityForResult(new Intent(activity, SubscripSetActivity.class), requestCode);
+            case R.id.subscribe_add:
+                WindowManager windowManager = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
+
+                View view = View.inflate(SubscriptionActivity.this, R.layout.popupwindow_subscribe_menu, null);
+                View parentView = View.inflate(SubscriptionActivity.this, R.layout.activity_subscription, null);
+                Button mySubscribeBtn = (Button) view.findViewById(R.id.subscribe_menu_my);
+                Button addSubscribeBtn = (Button) view.findViewById(R.id.subscribe_menu_add);
+
+                mySubscribeBtn.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Toast.makeText(SubscriptionActivity.this, "我的订阅", Toast.LENGTH_SHORT).show();
+                        closeListPopupWindow();
+                    }
+                });
+
+                addSubscribeBtn.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Toast.makeText(SubscriptionActivity.this, "新增订阅", Toast.LENGTH_SHORT).show();
+                        closeListPopupWindow();
+                    }
+                });
+
+                mSubscribeWindow = new PopupWindow(view, LinearLayout.LayoutParams.WRAP_CONTENT,LinearLayout.LayoutParams.WRAP_CONTENT,true);
+                mSubscribeWindow.showAsDropDown(getWindow().findViewById(item.getItemId()),windowManager.getDefaultDisplay().getWidth(),0);
+                DisplayUtil.backgroundAlpha(SubscriptionActivity.this, 0.5f);
+
+                mSubscribeWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+                    @Override
+                    public void onDismiss() {
+                        closeListPopupWindow();
+                    }
+                });
+
+                break;
+            case android.R.id.home:
+                onBackPressed();
                 break;
         }
         return super.onOptionsItemSelected(item);
     }
 
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        finish();
+    }
+
+    private void closeListPopupWindow() {
+        if (mSubscribeWindow != null) {
+            mSubscribeWindow.dismiss();
+            mSubscribeWindow = null;
+            DisplayUtil.backgroundAlpha(SubscriptionActivity.this, 1f);
+
+        }
+
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

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

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <Button
+        android:id="@+id/subscribe_menu_my"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/transparent"
+        android:text="我的订阅"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:padding="10dp"
+        android:textSize="15sp" />
+
+    <Button
+        android:id="@+id/subscribe_menu_add"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/transparent"
+        android:text="新增订阅"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:padding="10dp"
+        android:textSize="15sp" />
+
+</LinearLayout>

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

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal">
 
     <TextView
         android:id="@+id/emptyView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal|top"
-        android:drawableBottom="@drawable/icon_not_found"
+        android:layout_centerInParent="true"
         android:drawablePadding="5dp"
+        android:drawableTop="@drawable/ic_empty"
         android:gravity="center"
         android:padding="10dp"
         android:text="今天暂时没有数据 \n向上拉取前一天数据"
         android:textColor="@color/black"
-        android:textSize="@dimen/SmallerTextSize"
-          />
-</LinearLayout>
+        android:textSize="@dimen/SmallerTextSize" />
+</RelativeLayout>

WeiChat/src/main/res/menu/menu_subscribe.xml

@@ -0,0 +1,34 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.xzjmyk.pm.activity.MainActivity">
+    <!--<item
+        android:id="@+id/qrcode"
+        android:icon="@drawable/icon_crm_qrcode"
+        android:title="@string/search"
+        app:showAsAction="ifRoom" />-->
+    <item
+        android:id="@+id/subscribe_add"
+        android:icon="@drawable/fab_add"
+        android:title="@string/search"
+        app:showAsAction="ifRoom" />
+
+    <!--    <item
+            android:icon="@drawable/icon_crm_add"
+            android:title="@string/search"
+            app:showAsAction="ifRoom" />
+        <item
+
+            android:icon="@drawable/icon_crm_add"
+            android:title="@string/search"
+            app:showAsAction="ifRoom" />
+        <item
+
+            android:icon="@drawable/icon_crm_add"
+            android:title="@string/search"
+            app:showAsAction="ifRoom" />
+        <item
+            android:icon="@drawable/icon_crm_add"
+            android:title="@string/search"
+            app:showAsAction="ifRoom" />-->
+</menu>