订阅号界面

MPAndroidChart/build.gradle

@@ -20,6 +20,5 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:22.2.0'
 }

WeiChat/src/main/AndroidManifest.xml

@@ -10,11 +10,9 @@
 
     <!-- 拨打电话 -->
     <uses-permission android:name="android.permission.CALL_PHONE" />
-
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
     <uses-feature android:name="android.hardware.microphone" />
-
     <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.GET_TASKS" />

WeiChat/src/main/java/com/xzjmyk/pm/activity/AppConstant.java

@@ -1,51 +1,52 @@
 package com.xzjmyk.pm.activity;
 
 public class AppConstant {
-	/** 某些地方选择数据使用的常量 */
-	public static final String EXTRA_ACTION = "action";// 进入这个类的执行的操作
-	public static final int ACTION_NONE = 0;// 不执行操作
-	public static final int ACTION_SELECT = 1;// 执行选择操作
-	public static final String EXTRA_SELECT_IDS = "select_ids";// 选择对应项目的ids
-	public static final String EXTRA_SELECT_ID = "select_id";// 选择对应项目的id
-	public static final String EXTRA_SELECT_NAME = "select_name";// 选择的对应项目的名称
-	
-
-	/** 某些地方需要传递如ListView Position的数据 */
-	public static final String EXTRA_POSITION = "position";
-	public static final int INVALID_POSITION = -1;
-
-	// ///////////////////////////////////////////////////////////////////////////
-	// 用户信息参数，很多地方需要
-	public static final String EXTRA_USER_ID = "userId";// userId
-	public static final String EXTRA_NICK_NAME = "nickName";// nickName
-	public static final String EXTRA_NICK_CODE= "usercode";// nickName
-	public static final String EXTRA_IS_GROUP_CHAT = "isGroupChat";// 是否是群聊
-
-	// BusinessCircleActivity需要的
-	public static final String EXTRA_CIRCLE_TYPE = "circle_type";// 看的商务圈类型
-	public static final int CIRCLE_TYPE_MY_BUSINESS = 0;// 看的商务圈类型,是我的商务圈
-	public static final int CIRCLE_TYPE_PERSONAL_SPACE = 1;// 看的商务圈类型，是个人空间
-
-	// ////////////////
-
-	/** 商务圈发布的常量 */
-	/* 发说说(图文) */
-	public static final String EXTRA_IMAGES = "images";// 预览的那组图片
-	public static final String EXTRA_CHANGE_SELECTED = "change_selected";// 是否可以改变选择，这样在ActivityResult中会回传重新选择的结果
-
-	public static final String EXTRA_MSG_ID = "msg_id";// 公共消息id
-	public static final String EXTRA_FILE_PATH = "file_path";// 语音、视频文件路径
-	public static final String FILE_PAT_NAME = "file_name";//文件的名字
-	public static final String EXTRA_IMAGE_FILE_PATH = "image_file_path";// 图片文件路径
-	public static final String EXTRA_TIME_LEN = "time_len";// 语音、视频文件时长
-	//位置经纬度
-	public static final String EXTRA_LATITUDE = "latitude";
-	public static final String EXTRA_LONGITUDE = "longitude";
-
-	/* IM */
-	public static final String EXTRA_FRIEND = "friend";
-
-	/* 进入SingleImagePreviewActivity需要带上的参数 */
-	public static final String EXTRA_IMAGE_URI = "image_uri";
+    /**
+     * 某些地方选择数据使用的常量
+     */
+    public static final String EXTRA_ACTION = "action";// 进入这个类的执行的操作
+    public static final int ACTION_NONE = 0;// 不执行操作
+    public static final int ACTION_SELECT = 1;// 执行选择操作
+    public static final String EXTRA_SELECT_IDS = "select_ids";// 选择对应项目的ids
+    public static final String EXTRA_SELECT_ID = "select_id";// 选择对应项目的id
+    public static final String EXTRA_SELECT_NAME = "select_name";// 选择的对应项目的名称
+    /**
+     * 某些地方需要传递如ListView Position的数据
+     */
+    public static final String EXTRA_POSITION = "position";
+    public static final int INVALID_POSITION = -1;
+
+    // 用户信息参数，很多地方需要
+    public static final String EXTRA_USER_ID = "userId";// userId
+    public static final String EXTRA_NICK_NAME = "nickName";// nickName
+    public static final String EXTRA_NICK_CODE = "usercode";// nickName
+    public static final String EXTRA_IS_GROUP_CHAT = "isGroupChat";// 是否是群聊
+
+    // BusinessCircleActivity需要的
+    public static final String EXTRA_CIRCLE_TYPE = "circle_type";// 看的商务圈类型
+    public static final int CIRCLE_TYPE_MY_BUSINESS = 0;// 看的商务圈类型,是我的商务圈
+    public static final int CIRCLE_TYPE_PERSONAL_SPACE = 1;// 看的商务圈类型，是个人空间
+
+    /**
+     * 商务圈发布的常量
+     */
+    /* 发说说(图文) */
+    public static final String EXTRA_IMAGES = "images";// 预览的那组图片
+    public static final String EXTRA_CHANGE_SELECTED = "change_selected";// 是否可以改变选择，这样在ActivityResult中会回传重新选择的结果
+
+    public static final String EXTRA_MSG_ID = "msg_id";// 公共消息id
+    public static final String EXTRA_FILE_PATH = "file_path";// 语音、视频文件路径
+    public static final String FILE_PAT_NAME = "file_name";//文件的名字
+    public static final String EXTRA_IMAGE_FILE_PATH = "image_file_path";// 图片文件路径
+    public static final String EXTRA_TIME_LEN = "time_len";// 语音、视频文件时长
+    //位置经纬度
+    public static final String EXTRA_LATITUDE = "latitude";
+    public static final String EXTRA_LONGITUDE = "longitude";
+
+    /* IM */
+    public static final String EXTRA_FRIEND = "friend";
+
+    /* 进入SingleImagePreviewActivity需要带上的参数 */
+    public static final String EXTRA_IMAGE_URI = "image_uri";
 
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BusinessCircleActivity.java

@@ -11,7 +11,6 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.provider.MediaStore;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -467,10 +466,7 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView {
         FileDataHelper.readArrayData(this, mLoginUserId, FileDataHelper.FILE_BUSINESS_CIRCLE, new StringJsonArrayRequest.Listener<PublicMessage>() {
             @Override
             public void onResponse(ArrayResult<PublicMessage> result) {
-                for (int i = 0; i < result.getData().size(); i++) {
-                    Log.i("gong", result.getData().get(i).getLocation()==null?"":result.getData().get(i).getLocation());
-                }
-                if (result != null && result.getData() != null) {
+                if (result != null && result.getData() != null && result.getData().size() > 0) {
                     mMessages.clear();
                     mMessages.addAll(result.getData());
                     mAdapter.notifyDataSetInvalidated();
@@ -482,9 +478,7 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView {
 
     @Override
     protected void onResume() {
-//        if (mCoverImg != null) {
-//            mCoverImg.onResume();
-//        }
+
         super.onResume();
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorksFragment.java

@@ -20,7 +20,6 @@ import com.xzjmyk.pm.activity.ui.erp.activity.ClientActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.ErpMenActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.ui.message.SubscriptionActivity;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.volley.FastVolley;
@@ -113,7 +112,7 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
                 startActivity(intent);
                 break;
             case R.id.my_data_rl:
-                startActivity(new Intent(getActivity(), SubscriptionActivity.class));
+//                startActivity(new Intent(getActivity(), SubscriptionActivity.class));
                 ToastUtil.showToast(getActivity(), "抱歉，该功能尚未完善");
                 break;
 

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

@@ -302,8 +302,7 @@ public class RoomInfoActivity extends BaseActivity {
         MucRoomMember my = null;
         if (munber != null) {
             for (int i = 0; i < munber.size(); i++) {
-
-                if (munber.get(1).getRole() == 2) {
+                if (munber.get(i).getRole() == 2) {
                     isHaveM = true;
                 }
                 String userId = munber.get(i).getUserId();
@@ -331,23 +330,7 @@ public class RoomInfoActivity extends BaseActivity {
                     mMembers.add(0, create);
             }
         }
-//        if (munber != null) {
-//            MucRoomMember leaguer = null;
-//            for (int i = 0; i < munber.size(); i++) {
-//                leaguer = munber.get(i);
-//                if (leaguer.getUserId() == mucRoom.getUserId()) {//是创建者
-//                    create = leaguer;
-//                } else if (leaguer.getRole() == 2) {  //管理员
-//                    isHaveM = true;//如果存在管理员 当为群主时候显示移除管理员选项
-//                    mMembers.add(0, leaguer);
-//                } else if (leaguer.getRole() == 3) { //成员
-//                    mMembers.add(leaguer);
-//                }
-//            }
-//            if (create != null) {
-//                mMembers.add(0, create);
-//            }
-//        }
+
         mAdapter = new GridViewAdapter(mMembers);
         mGridView.setAdapter(mAdapter);
         if (TextUtils.isEmpty(myNickName)) {

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

@@ -4,15 +4,17 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.LinearLayout;
-import android.widget.ListView;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.message.SubscriptionBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.view.MyListView;
 
 import java.util.ArrayList;
 
@@ -39,11 +41,10 @@ public class SubscriptionActivity extends BaseActivity {
     }
 
     private void init() {
-        //TODO SubscriptionBeans获取数据 。。。。
         SubscriptionBean bean = null;
         SubscriptionBeans = new ArrayList<>();
         ArrayList<SubscriptionBean.SubscriptionMessage> messages = null;
-        for (int i = 0; i < 5; i++) {
+        for (int i = 0; i < 5; ) {
             bean = new SubscriptionBean();
             bean.setSize(5);
             bean.setTime("2012-11-0" + (++i));
@@ -52,7 +53,7 @@ public class SubscriptionActivity extends BaseActivity {
                 SubscriptionBean.SubscriptionMessage message = bean.getSubscriptionMessage();
                 message.setImgUrl("https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1642940013,2147239593&fm=111&gp=0.jpg");
                 message.setSub("这个一个测试信息:" + "其中j==" + j + "\ni==" + i);
-                message.setTag((int) (Math.random() * 2));
+                message.setTag(j == 0 ? 1 : 2);
                 message.setUrl("ss");
                 messages.add(message);
             }
@@ -64,14 +65,13 @@ public class SubscriptionActivity extends BaseActivity {
     }
 
     private void initView() {
-        listView = (PullToRefreshListView) findViewById(R.id.pull_refresh_list);
+        listView = (PullToRefreshListView) findViewById(R.id.listview);
         adapter = new SubscriptionAdapter();
     }
 
 
     //外层list
     class SubscriptionAdapter extends BaseAdapter {
-
         @Override
         public int getCount() {
             return SubscriptionBeans.size();
@@ -89,18 +89,37 @@ public class SubscriptionActivity extends BaseActivity {
 
 
         @Override
-        public View getView(int position, View contextView, ViewGroup viewGroup) {
-            ListView listview = null;
+        public View getView(final int position, View contextView, ViewGroup viewGroup) {
+            Viewholder viewholder = null;
             if (contextView == null) {
                 contextView = LayoutInflater.from(activity).inflate(R.layout.subscription, null);
-                listview = (ListView) contextView.findViewById(R.id.listview);
-                contextView.setTag(listview);
+                viewholder = new Viewholder();
+                viewholder.tvTime = (TextView) contextView.findViewById(R.id.tvTime);
+                viewholder.listview = (MyListView) contextView.findViewById(R.id.listview);
+                contextView.setTag(viewholder);
             } else {
-                listview = (ListView) contextView.getTag();
+                viewholder = (Viewholder) contextView.getTag();
             }
-            listview.setAdapter(new ListAdapter(SubscriptionBeans.get(position).getSubscriptionMessages()));
+            viewholder.tvTime.setText(SubscriptionBeans.get(position).getTime());
+            viewholder.listview.setAdapter(new ListAdapter(SubscriptionBeans.get(position).getSubscriptionMessages()));
+            viewholder.listview.setTag(SubscriptionBeans.get(position));
+            viewholder.listview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                @Override
+                public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+                    SubscriptionBean.SubscriptionMessage bean = SubscriptionBeans.get(position).getSubscriptionMessages().get(i);
+                    //TODO 点击跳到web页面
+
+                }
+            });
             return contextView;
         }
+
+        class Viewholder {
+            TextView tvTime;
+            MyListView listview;
+        }
+
+
     }
 
     //内层list

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

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.handmark.pulltorefresh.library.PullToRefreshListView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:ptr="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/pull_refresh_list"
+    android:id="@+id/listview"
     android:layout_width="match_parent"
+    android:padding="10dp"
     android:layout_height="match_parent"
     android:layout_above="@+id/bottom_view"
+    android:scrollbars="none"
     android:divider="#00000000"
     ptr:ptrAnimationStyle="flip"
     ptr:ptrDrawableEnd="@drawable/default_ptr_rotate"

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

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:layout_marginTop="10dp"
     android:layout_height="wrap_content">
 
     <LinearLayout
         android:id="@+id/small_ll"
         android:layout_width="match_parent"
         android:layout_height="100dp"
-        android:background="@color/table_background"
         android:orientation="horizontal"
         android:visibility="gone">
 
@@ -16,27 +16,31 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_weight="1"
+            android:maxLines="3"
+            android:padding="8dp"
             android:text="公司发布啊收到回复啊一般的方式发白色的发挥"
-            android:textColor="@color/white"
-            android:textSize="20sp" />
+            android:textSize="16sp" />
 
         <ImageView
             android:layout_width="100dp"
             android:layout_height="100dp"
-            android:src="@drawable/head1" />
+            android:padding="8dp"
+            android:src="@drawable/bess" />
     </LinearLayout>
 
     <RelativeLayout
         android:id="@+id/big_rl"
         android:layout_width="match_parent"
         android:layout_height="130dp"
-        android:background="@color/table_background"
+        android:padding="5dp"
         android:visibility="gone">
 
         <ImageView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:src="@drawable/head1" />
+            android:scaleType="fitXY"
+            android:src="@drawable/qzone_phone" />
+
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -44,6 +48,6 @@
             android:paddingLeft="10dp"
             android:text="公司发布啊收到回复啊一般的方式发白色的发挥"
             android:textColor="@color/white"
-            android:textSize="20sp" />
+            android:textSize="14sp" />
     </RelativeLayout>
 </FrameLayout>

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

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_margin="10dp"
-    card_view:background="@color/white">
+    android:layout_height="wrap_content"
+    card_view:contentPadding="5dp">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/white"
         android:orientation="vertical">
 
         <TextView
@@ -22,7 +22,9 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/multi_praise_tv"
-            android:paddingTop="5dp" />
+            android:divider="@color/item_line"
+            android:paddingTop="5dp"
+            android:scrollbarSize="0dp"
+            android:scrollbars="none|vertical" />
     </LinearLayout>
-
-</RelativeLayout>
+</android.support.v7.widget.CardView>

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue May 31 09:33:43 CST 2016
+#Mon Jun 06 08:53:18 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

libedittextformlibrary/build.gradle

@@ -20,6 +20,5 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:22.2.0'
 }

libfloatingactionbutton/build.gradle

@@ -20,6 +20,5 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:22.2.0'
 }

libpsectionlistview/build.gradle

@@ -20,6 +20,5 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:22.2.0'
 }

librarymenudrawer/build.gradle

@@ -20,6 +20,5 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:22.2.0'
 }

materialdialogs/build.gradle

@@ -20,7 +20,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:22.2.0'
     compile 'com.android.support:recyclerview-v7:22.2.0'
 }