crm调整ui

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

@@ -537,18 +537,18 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                         );
                                 CommonUtil.textAarrySpanForStyle(tv_rank_sale_right,
                                         "NO.1:" + sales.getJSONArray(0).getString(1)
-                                                + "\n￥:" + sales.getJSONArray(0).getIntValue(0) + ""
+                                                + "\n￥" + sales.getJSONArray(0).get(0) + ""
                                         , new String[]{sales.getJSONArray(0).getString(1),
-                                                String.valueOf(sales.getJSONArray(0).getIntValue(0))},
+                                                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) + "元\n第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)
-                                        + "\n￥:" + 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);//自己
                             }
                         }
@@ -574,9 +574,9 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                             , String.valueOf(visits.getJSONArray(0).getIntValue(2))},
                                     ct.getResources().getColor(R.color.gray));
                         } else {
-                            tv_rank_visit_left.setText("NO:" + visits.getJSONArray(1).getIntValue(3)+
+                            tv_rank_visit_left.setText("NO." + visits.getJSONArray(1).getIntValue(3)+
                                     "\n"+visits.getJSONArray(1).getIntValue(2) + "个");
-                            tv_rank_visit_right.setText("NO1::" + visits.getJSONArray(1).getString(0)
+                            tv_rank_visit_right.setText("NO.1:" + visits.getJSONArray(1).getString(0)
                                     + "\n" +visits.getJSONArray(1).getIntValue(2)
                                     + "个");
                            
@@ -598,22 +598,22 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                         if (profits.size() == 2) {
                             tv_rank_rirun_left.setText("NO:"+"__"+"\n￥__");
                             tv_rank_rirun_right.setText("NO1:" + profits.getJSONArray(1).getString(1)
-                                    + "\n￥" + profits.getJSONArray(1).getIntValue(0));
-                            profits.getJSONArray(1).getIntValue(0);//第一名  元
+                                    + "\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.__"+"\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));
                             
                         }
                     }
@@ -621,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;
@@ -794,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/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/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/values/styles.xml

@@ -708,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>