crm ui标题栏更改前

WeiChat/src/main/AndroidManifest.xml

@@ -56,7 +56,6 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <!-- 百度自动更新 -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -518,6 +517,7 @@
         <activity
             android:name=".ui.erp.activity.oa.OAListActivity"
             android:label="外勤签到列表" />
+
     </application>
 
 </manifest>

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

@@ -33,7 +33,6 @@ import com.xzjmyk.pm.activity.volley.FastVolley;
 import org.apache.http.cookie.Cookie;
 
 import java.io.File;
-import java.util.List;
 
 public class MyApplication extends Application {
     /**
@@ -55,6 +54,7 @@ public class MyApplication extends Application {
     public void onCreate() {
         super.onCreate();
         INSTANCE = this;
+//        CrashReport.initCrashReport(getApplicationContext(), "900050585", false);
         PreferenceUtils.putBoolean(this, Constants.IS_NOTIFICATION, false);//不进行通知
         new Handler().postDelayed(new Runnable() {
             @Override

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

@@ -2,7 +2,6 @@ package com.xzjmyk.pm.activity.ui.erp.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -18,6 +17,9 @@ import com.xzjmyk.pm.activity.view.PullToRefreshSlideListView;
 
 import java.util.ArrayList;
 
+/**
+ * 通知公告页面
+ */
 public class NoticeMenuActivity extends BaseActivity {
     private ArrayList<Bean> beans;
     public static final int NEWS_REC = 0x01, GONGGAO_REC = 0x03, NOTICES_REC = 0x02;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessAddActivity.java

@@ -116,7 +116,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
 
     private void initView() {
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle("新建商机");
+        getSupportActionBar().setTitle("创建商机");
         et_business_enterMan.setText(MyApplication.getInstance().mLoginUser.getNickName());
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessDetailActivty.java

@@ -156,7 +156,7 @@ public class BusinessDetailActivty extends BaseActivity {
             getSupportActionBar().setTitle("商机跟进");
             ll_top_state.setVisibility(View.VISIBLE);
         } else if (type == 1) {
-            getSupportActionBar().setTitle("抢商机");
+            getSupportActionBar().setTitle("抢占商机");
             ll_top_state.setVisibility(View.GONE);
         } else if (type == 2) {
             getSupportActionBar().setTitle("商机分配");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/ClientActivity.java

@@ -532,23 +532,23 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                             if (sales.size() != 2) {
                                 //__元/第__名   第一名:__金额:__元
                                 CommonUtil.textAarrySpanForStyle(tv_rank_sale_left,
-                                        "￥__" + "/NO."+"__",
-                                        new String[]{"__"},ct.getResources().getColor(R.color.yellow_home)
+                                         "NO."+"__"+"\n￥__",
+                                        new String[]{"__"},ct.getResources().getColor(R.color.gray)
                                         );
                                 CommonUtil.textAarrySpanForStyle(tv_rank_sale_right,
                                         "NO.1:" + sales.getJSONArray(0).getString(1)
-                                                + "/￥:" + sales.getJSONArray(0).getIntValue(0) + ""
-                                ,new String[]{sales.getJSONArray(0).getString(1),
-                                        String.valueOf(sales.getJSONArray(0).getIntValue(0))},
-                                        ct.getResources().getColor(R.color.yellow_home));
+                                                + "\n￥" + sales.getJSONArray(0).get(0) + ""
+                                        , new String[]{sales.getJSONArray(0).getString(1),
+                                                String.valueOf(sales.getJSONArray(0).get(0))},
+                                        ct.getResources().getColor(R.color.gray));
 //                                tv_rank_sale_right.setText("第一名:" + sales.getJSONArray(0).getString(1)
 //                                        + "金额:" + sales.getJSONArray(0).getIntValue(0) + "元");
                 
                             } else {
-                                tv_rank_sale_left.setText(sales.getJSONArray(1).getIntValue(0) + "元/第1名");
+                                tv_rank_sale_left.setText("NO.1\n"+"￥"+sales.getJSONArray(1).get(0));
                                 tv_rank_sale_right.setText("NO._:" + sales.getJSONArray(0).getString(1)
-                                        + "￥:" + sales.getJSONArray(1).getIntValue(0) + "");
-                                sales.getJSONArray(1).getIntValue(0);//自己  元
+                                        + "\n￥" + sales.getJSONArray(1).get(0) + "");
+                                sales.getJSONArray(1).get(0);//自己  元
                                 sales.getJSONArray(1).getString(1);//自己
                             }
                         }
@@ -559,65 +559,61 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                         if (visits.size() != 2) {
                             //名称 拜访次数，拜访个数，排名
                             CommonUtil.textAarrySpanForStyle(tv_rank_visit_left,
-                                    "__" + "个/" +
                                            /* visits.getJSONArray(0).getIntValue(1) + "次/第"*/
-                                           "NO."+ "__" ,
+                                           "NO."+ "__" +"\n__" + "个",
                                     new String[]{"__"
                                           /*  , String.valueOf(visits.getJSONArray(0).getIntValue(1))*/
                                             , "__"
-                                    }, ct.getResources().getColor(R.color.yellow_home));
+                                    }, ct.getResources().getColor(R.color.black));
                             CommonUtil.textAarrySpanForStyle(tv_rank_visit_right,
                                     "NO.1:" + visits.getJSONArray(0).getString(0)
-                                            + "/" + visits.getJSONArray(0).getIntValue(2)
-                                            + "个/" + visits.getJSONArray(0).getIntValue(1) + " 次"
+                                            + "\n" + visits.getJSONArray(0).getIntValue(2)
+                                            + "个"
+//                                            + visits.getJSONArray(0).getIntValue(1) + " 次"
                                     , new String[]{visits.getJSONArray(0).getString(0)
-                                            , String.valueOf(visits.getJSONArray(0).getIntValue(2))
-                                            , String.valueOf(visits.getJSONArray(0).getIntValue(1))},
-                                    ct.getResources().getColor(R.color.yellow_home));
+                                            , String.valueOf(visits.getJSONArray(0).getIntValue(2))},
+                                    ct.getResources().getColor(R.color.gray));
                         } else {
-                            tv_rank_visit_left.setText(visits.getJSONArray(1).getIntValue(2) + "个/" +
-                                    visits.getJSONArray(1).getIntValue(1) + "次/第"
-                                    + visits.getJSONArray(1).getIntValue(3) + "名");
-                            tv_rank_visit_right.setText("第一名:" + visits.getJSONArray(1).getString(0)
-                                    + "拜访:" + visits.getJSONArray(1).getIntValue(2)
-                                    + "个/" + visits.getJSONArray(1).getIntValue(1) + "次");
+                            tv_rank_visit_left.setText("NO." + visits.getJSONArray(1).getIntValue(3)+
+                                    "\n"+visits.getJSONArray(1).getIntValue(2) + "个");
+                            tv_rank_visit_right.setText("NO.1:" + visits.getJSONArray(1).getString(0)
+                                    + "\n" +visits.getJSONArray(1).getIntValue(2)
+                                    + "个");
                            
                         }
                     }else{
                         CommonUtil.textAarrySpanForStyle(tv_rank_visit_left,
-                                "__" + "个/" +
-                                        "__" + "次/第"
-                                        + "__"  + "名",
+                                "NO.__" + "\n__个",
                                 new String[]{"__"}
-                                , ct.getResources().getColor(R.color.yellow_home));
+                                , ct.getResources().getColor(R.color.gray));
                         CommonUtil.textAarrySpanForStyle(tv_rank_visit_right,
-                                "第一名:" + "__"
-                                        + "拜访:" +  "__"
-                                        + "个/" +  "__" + "次"
+                                "NO1:" + "__"
+                                       + "\n__"
+                                        + "个"
                                 , new String[]{ "__"},
-                                ct.getResources().getColor(R.color.yellow_home));
+                                ct.getResources().getColor(R.color.gray));
                     }
 
                     if (profits != null&&!profits.isEmpty()) {
                         if (profits.size() == 2) {
-                            tv_rank_rirun_left.setText("__" + "元/第"+"__"+"名");
-                            tv_rank_rirun_right.setText("第一名:" + profits.getJSONArray(1).getString(1)
-                                    + "金额:" + profits.getJSONArray(1).getIntValue(0) + "元");
-                            profits.getJSONArray(1).getIntValue(0);//第一名  元
+                            tv_rank_rirun_left.setText("NO:"+"__"+"\n￥__");
+                            tv_rank_rirun_right.setText("NO1:" + profits.getJSONArray(1).getString(1)
+                                    + "\n￥" + profits.getJSONArray(1).get(0));
+                            profits.getJSONArray(1).get(0);//第一名  元
                             profits.getJSONArray(1).getString(1);//第一名
                             profits.getJSONArray(1).getIntValue(2);//第一名  元
                         } else {
                             CommonUtil.textAarrySpanForStyle(tv_rank_rirun_left,
-                                    "￥"+"__"+ " /NO.__",
+                                    "NO.__"+"\n￥"+"__",
                                     new String[]{
-                                            "__","__"},ct.getResources().getColor(R.color.yellow_home));
+                                            "__","__"},ct.getResources().getColor(R.color.gray));
                             CommonUtil.textAarrySpanForStyle(tv_rank_rirun_right,
                                     "NO.1:" + profits.getJSONArray(0).getString(1)
-                                            + "/￥" + profits.getJSONArray(0).getIntValue(0) + " "
+                                            + "\n￥" + profits.getJSONArray(0).get(0) + " "
                                     , new String[]{
                                             profits.getJSONArray(0).getString(1),
-                                            String.valueOf(profits.getJSONArray(0).getIntValue(0))
-                                    }, ct.getResources().getColor(R.color.yellow_home));
+                                            String.valueOf(profits.getJSONArray(0).get(0))
+                                    }, ct.getResources().getColor(R.color.gray));
                             
                         }
                     }
@@ -625,23 +621,23 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
 
                     if (receivables != null&&!receivables.isEmpty()) {
                         if (receivables.size() == 2) {
-                            tv_rank_income_left.setText(receivables.getJSONArray(1).getIntValue(0) + "元/第1名");
-                            tv_rank_income_right.setText("第一名:" + receivables.getJSONArray(1).getString(1)
-                                    + "金额:" + receivables.getJSONArray(1).getIntValue(0) + "元");
-                            receivables.getJSONArray(1).getIntValue(0);//第一名  元
+                            tv_rank_income_left.setText("NO.1\n"+"￥"+receivables.getJSONArray(1).get(0));
+                            tv_rank_income_right.setText("NO.1:" + receivables.getJSONArray(1).getString(1)
+                                    + "\n￥" + receivables.getJSONArray(1).get(0));
+                            receivables.getJSONArray(1).get(0);//第一名  元
                             receivables.getJSONArray(1).getString(1);//第一名
-                            receivables.getJSONArray(1).getIntValue(2);//第一名  元
+                            receivables.getJSONArray(1).get(2);//第一名  元
                         } else {
                             CommonUtil.textSpanForStyle(tv_rank_income_left,
-                                    "￥"+"__" + "/NO.__"
+                                    "NO.__"+"\n￥"+"__"
                                     , "__",
-                                    ct.getResources().getColor(R.color.yellow_home));
+                                    ct.getResources().getColor(R.color.gray));
                             CommonUtil.textAarrySpanForStyle(tv_rank_income_right,
                                     "NO.1:" + receivables.getJSONArray(0).getString(1)
-                                            + "/Y:" + receivables.getJSONArray(0).getIntValue(0) + " "
+                                            + "\n￥:" + receivables.getJSONArray(0).get(0) + " "
                                     , new String[]{receivables.getJSONArray(0).getString(1),
-                                            String.valueOf(receivables.getJSONArray(0).getIntValue(0))},
-                                    ct.getResources().getColor(R.color.yellow_home));
+                                            String.valueOf(receivables.getJSONArray(0).get(0))},
+                                    ct.getResources().getColor(R.color.gray));
                         }
                     }
                     break;
@@ -798,9 +794,11 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                     if (array!=null){
                         if (array.size()>0){
                             //显示下属面板
+                            Log.i("raomeng",msg.getData().getString("result"));
                             ll_subordinate.setVisibility(View.VISIBLE);
                         }else{
                             //隐藏下属面板
+                            Log.i("raomeng",msg.getData().getString("result"));
                             ll_subordinate.setVisibility(View.GONE);
                         }
                     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/HListViewOneAdapter.java

@@ -69,16 +69,16 @@ public class HListViewOneAdapter extends BaseAdapter {
             if (!StringUtils.isEmpty(items.get(i))) {
                 holder.tv_item[i].setText(items.get(i));
                 if (i!=0) {
-
+                    holder.tv_item[i].setTextSize(14);
                    // holder.tv_item[i].setMinWidth(CommonUtil.dip2px(ct, 50));
                 }else{
                     if (index!=0){
                         holder.tv_item[i].setText("●");
-                        holder.tv_item[i].setTextSize(16);
+                        holder.tv_item[i].setTextSize(18);
                         holder.tv_item[i].setTextColor(Color.parseColor(items.get(i)));
                       //  holder.tv_item[i].setMinWidth(CommonUtil.dip2px(ct, 105));
                     }else{
-                        holder.tv_item[i].setTextSize(10);
+                        holder.tv_item[i].setTextSize(14);
                         holder.tv_item[i].setTextColor(ct.getResources().getColor(R.color.black));
                       //  holder.tv_item[i].setBackgroundColor(ct.getResources().getColor(R.color.yellow_home));
                     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -16,6 +16,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.lidroid.xutils.view.annotation.ViewInject;
+//import com.tencent.bugly.crashreport.CrashReport;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
@@ -167,6 +168,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     protected void onCreateView(Bundle savedInstanceState, boolean createView) {
         if (createView) {
             initView();
+//            CrashReport.testJavaCrash();
         }
     }
 

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

@@ -480,7 +480,7 @@ public class SubscriptionActivity extends BaseActivity {
                     isReColor = R.color.red;
                 } else {
                     isRe = "已读";
-                    isReColor = R.color.text_color;
+                    isReColor = R.color.white;
                 }
                 holder.big_isre_tv.setText(isRe);
                 holder.big_isre_tv.setTextColor(getResources().getColor(isReColor));

WeiChat/src/main/res/drawable/selector_popup_btn.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/table_background" android:state_checked="true"/>
+    <item android:drawable="@color/table_background" android:state_selected="true"/>
+    <item android:drawable="@color/table_background" android:state_pressed="true"/>
+
+    <item android:drawable="@color/white"/>
+</selector>

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

@@ -66,7 +66,7 @@
         <Button
             android:id="@+id/bt_qiang"
             style="@style/crm_business_btn"
-            android:text="抢商机" />
+            android:text="抢占商机" />
 
         <Button
             android:id="@+id/bt_manage"

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

@@ -449,15 +449,17 @@
                 android:layout_height="wrap_content"
                     android:text="              " />
                 <TextView
-                    android:text="计划销售额/毛利润"
+                    android:text="计划销售额/毛利润\n（万元）"
                     android:layout_weight="1"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:gravity="center"/>
                 <TextView
-                    android:text="实际销售额/毛利润"
+                    android:text="实际销售额/毛利润\n（万元）"
                     android:layout_weight="1"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:gravity="center" />
                 </LinearLayout>
             <LinearLayout style="@style/LinearLayout_horizontal"
                 android:padding="8dp"

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

@@ -56,8 +56,7 @@
     <RelativeLayout
         android:id="@+id/big_rl"
         android:layout_width="match_parent"
-        android:layout_height="130dp"
-        android:visibility="gone">
+        android:layout_height="130dp">
 
         <ImageView
             android:id="@+id/big_img"
@@ -93,6 +92,8 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_margin="10dp"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="5dp"
             android:textSize="@dimen/text_hine" />
     </RelativeLayout>
 </FrameLayout>

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

@@ -1,116 +1,125 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:descendantFocusability="blocksDescendants"
-    android:layout_height="wrap_content"
-
-    style="@style/crm_ll_card">
-
-    <LinearLayout style="@style/crm_ll_sale_item">
-
-        <TextView
-            android:text="商机编号"
-            android:minWidth="90dp"
-            style="@style/TextView_Basic" />
-        <TextView
-            android:id="@+id/tv_crm_business_num"
-            android:text="XXXXXXX"
-            style="@style/TextView_Basic" />
-    </LinearLayout>
-    <LinearLayout style="@style/crm_ll_sale_item">
-
-        <TextView
-            android:minWidth="90dp"
-            android:text="商机库"
-            style="@style/TextView_Basic" />
-        <TextView
-            android:id="@+id/tv_crm_business_steps"
-            style="@style/TextView_Basic" />
-    </LinearLayout>
-    <LinearLayout style="@style/crm_ll_sale_item">
-
-        <TextView
-            android:minWidth="90dp"
-            android:text="商机名称"
-            style="@style/TextView_Basic" />
-
-        <TextView
-            android:id="@+id/tv_crm_business_name"
-            android:text="XXXXXXX"
-            style="@style/TextView_Basic" />
-    </LinearLayout>
-
-    <LinearLayout style="@style/crm_ll_sale_item">
-
-        <TextView
-            android:minWidth="90dp"
-            android:text="商机来源"
-            style="@style/TextView_Basic" />
+<RelativeLayout  xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <LinearLayout
+        android:descendantFocusability="blocksDescendants"
+        android:layout_height="wrap_content"
+        style="@style/crm_ll_card"
+        android:id="@+id/business_detail_ll">
+
+        <LinearLayout style="@style/crm_ll_sale_item">
+
+            <TextView
+                android:text="商机编号"
+                android:minWidth="90dp"
+                style="@style/TextView_Basic" />
+            <TextView
+                android:id="@+id/tv_crm_business_num"
+                android:text="XXXXXXX"
+                style="@style/TextView_Basic" />
+        </LinearLayout>
+        <LinearLayout style="@style/crm_ll_sale_item">
+
+            <TextView
+                android:minWidth="90dp"
+                android:text="商机库"
+                style="@style/TextView_Basic" />
+            <TextView
+                android:id="@+id/tv_crm_business_steps"
+                style="@style/TextView_Basic" />
+        </LinearLayout>
+        <LinearLayout style="@style/crm_ll_sale_item">
+
+            <TextView
+                android:minWidth="90dp"
+                android:text="商机名称"
+                style="@style/TextView_Basic" />
+
+            <TextView
+                android:id="@+id/tv_crm_business_name"
+                android:text="XXXXXXX"
+                style="@style/TextView_Basic" />
+        </LinearLayout>
+
+        <LinearLayout style="@style/crm_ll_sale_item">
+
+            <TextView
+                android:minWidth="90dp"
+                android:text="商机来源"
+                style="@style/TextView_Basic" />
+
+            <TextView
+                android:id="@+id/tv_crm_business_source"
+                android:text="XXXXXXX"
+                style="@style/TextView_Basic" />
+        </LinearLayout>
+
+        <LinearLayout style="@style/crm_ll_sale_item">
+
+            <TextView
+                android:minWidth="90dp"
+                android:text="电话"
+                style="@style/TextView_Basic" />
+
+            <TextView
+                android:id="@+id/tv_crm_business_phone"
+                android:text="XXXXXXX"
+                style="@style/TextView_Basic" />
+        </LinearLayout>
+
+        <LinearLayout style="@style/crm_ll_sale_item">
+
+            <TextView
+                android:minWidth="90dp"
+                android:text="备注"
+                style="@style/TextView_Basic" />
+
+            <TextView
+                android:id="@+id/tv_crm_business_note"
+                android:text="XXXXXXX"
+                style="@style/TextView_Basic" />
+        </LinearLayout>
+
+        <RelativeLayout
+            style="@style/crm_ll_sale_item"
+            android:layout_gravity="right">
+
+            <TextView
+                android:minWidth="90dp"
+                android:id="@+id/tv_crm_business_datetv"
+                android:text="xx日期"
+                android:layout_gravity="center_vertical"
+                style="@style/TextView_Basic" />
+
+            <TextView
+                android:id="@+id/tv_crm_business_date"
+                android:layout_toRightOf="@+id/tv_crm_business_datetv"
+                android:text="XXXXXXX"
+                android:layout_gravity="center_vertical"
+                style="@style/TextView_Basic" />
+
+            <!--<Button
+                android:id="@+id/bt_business_qiang"
+                android:layout_alignParentRight="true"
+                android:text="抢"
+                android:layout_width="80dp"
+                android:layout_gravity="center_vertical|right"
+                style="@style/crm_business_btn_single"
+                android:focusable="false"
+                android:gravity="center" />-->
+
+        </RelativeLayout>
 
-        <TextView
-            android:id="@+id/tv_crm_business_source"
-            android:text="XXXXXXX"
-            style="@style/TextView_Basic" />
     </LinearLayout>
 
-    <LinearLayout style="@style/crm_ll_sale_item">
-
-        <TextView
-            android:minWidth="90dp"
-            android:text="电话"
-            style="@style/TextView_Basic" />
-
-        <TextView
-            android:id="@+id/tv_crm_business_phone"
-            android:text="XXXXXXX"
-            style="@style/TextView_Basic" />
-    </LinearLayout>
-
-    <LinearLayout style="@style/crm_ll_sale_item">
-
-        <TextView
-            android:minWidth="90dp"
-            android:text="备注"
-            style="@style/TextView_Basic" />
-
-        <TextView
-            android:id="@+id/tv_crm_business_note"
-            android:text="XXXXXXX"
-            style="@style/TextView_Basic" />
-    </LinearLayout>
+    <ImageView
+        android:id="@+id/iv_business_qiang"
+        android:layout_width="100dp"
+        android:layout_height="30dp"
+        android:layout_alignParentRight="true"
+        android:src="@drawable/ic_qiang"
+        android:layout_marginBottom="5dp"
+        android:layout_alignBottom="@id/business_detail_ll"/>
+</RelativeLayout>
 
-    <RelativeLayout
-        style="@style/crm_ll_sale_item"
-        android:layout_gravity="right">
-
-        <TextView
-            android:minWidth="90dp"
-            android:id="@+id/tv_crm_business_datetv"
-            android:text="xx日期"
-            android:layout_gravity="center_vertical"
-            style="@style/TextView_Basic" />
-
-        <TextView
-            android:id="@+id/tv_crm_business_date"
-            android:layout_toRightOf="@+id/tv_crm_business_datetv"
-            android:text="XXXXXXX"
-            android:layout_gravity="center_vertical"
-            style="@style/TextView_Basic" />
-
-        <!--<Button
-            android:id="@+id/bt_business_qiang"
-            android:layout_alignParentRight="true"
-            android:text="抢"
-            android:layout_width="80dp"
-            android:layout_gravity="center_vertical|right"
-            style="@style/crm_business_btn_single"
-            android:focusable="false"
-            android:gravity="center" />-->
-        <ImageView
-            android:id="@+id/iv_business_qiang"
-            android:layout_width="100dp"
-            android:layout_height="30dp"
-            android:layout_alignParentRight="true"
-            android:src="@drawable/ic_qiang"/>
-    </RelativeLayout>
-
-</LinearLayout>

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

@@ -10,8 +10,8 @@
         android:id="@+id/subscribe_menu_my"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/transparent"
         android:text="我的订阅"
+        android:background="@drawable/selector_popup_btn"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:padding="10dp"
@@ -21,8 +21,8 @@
         android:id="@+id/subscribe_menu_add"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/transparent"
         android:text="新增订阅"
+        android:background="@drawable/selector_popup_btn"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:padding="10dp"

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

@@ -611,14 +611,14 @@
     </style>
 
     <style name="crm_card_round_tv">
-        <item name="android:layout_width">50dp</item>
+        <item name="android:layout_width">80dp</item>
         <item name="android:layout_height">50dp</item>
        
         <item name="android:layout_marginLeft">8dp</item>
         <item name="android:layout_marginTop">8dp</item>
         <item name="android:layout_marginBottom">8dp</item>
         <item name="android:layout_marginRight">1dp</item>
-        <item name="android:gravity">center</item>
+        <item name="android:gravity">center_vertical|left</item>
        
     </style>
 
@@ -639,8 +639,9 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_gravity">center_vertical</item>
         <item name="android:layout_marginRight">3dp</item>
+        <item name="android:layout_marginLeft">10dp</item>
         <item name="android:layout_weight">2</item>
-        <item name="android:text">"￥__/NO._"</item>
+        <item name="android:text">"NO._\n￥__"</item>
     </style>
 
     <style name="crm_tv_ranking_right">
@@ -649,7 +650,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_gravity">center_vertical</item>
         <item name="android:layout_weight">3</item>
-        <item name="android:text">"NO._:__/￥__"</item>
+        <item name="android:text">"NO._:__\n￥__"</item>
     </style>
     <!--crm sale-->
     <style name="crm_ll_sale" parent="LinearLayout_horizontal">
@@ -707,6 +708,8 @@
         <item name="android:layout_height">match_parent</item>
         <item name="android:divider">#00000000</item>
         <item name="android:dividerHeight">20dp</item>
+        <item name="android:headerDividersEnabled">false</item>
+        <item name="android:footerDividersEnabled">true</item>
         <item name="android:scrollbars">none</item>
         <item name="android:listSelector">@android:color/transparent</item>
     </style>

gradle.properties

@@ -0,0 +1,20 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
+android.useDeprecatedNdk=true