浏览代码

更改ui后 标题栏 crm

Arison 9 年之前
父节点
当前提交
1fbcf60dfa

+ 25 - 12
WeiChat/src/main/AndroidManifest.xml

@@ -409,17 +409,24 @@
         <activity
             android:name=".ui.erp.activity.oa.AddMeetingActivity"
             android:label="新增会议" />
-        <activity android:name=".ui.erp.activity.oa.OAActivity" />
+        <activity android:name=".ui.erp.activity.oa.OAActivity"
+            />
         <activity
             android:name=".ui.erp.activity.oa.StatisticsActivity"
             android:label="考勤统计" />
         <activity android:name=".ui.erp.activity.TextErpActivity" />
-        <activity android:name=".ui.erp.activity.crm.BusinessActivity" />
-        <activity android:name=".ui.erp.activity.crm.BusinessDetailActivty" />
-        <activity android:name=".ui.erp.activity.crm.BusinessDetailInfoActivity" />
-        <activity android:name=".ui.erp.activity.crm.BusinessLessActivity" />
-        <activity android:name=".ui.erp.activity.crm.BusinessTransferActivity" />
-        <activity android:name=".ui.erp.activity.crm.BusinessSelectCustomerActivity" />
+        <activity android:name=".ui.erp.activity.crm.BusinessActivity"
+            android:theme="@style/CrmThemeBlue"/>
+        <activity android:name=".ui.erp.activity.crm.BusinessDetailActivty"
+            android:theme="@style/CrmThemeBlue"/>
+        <activity android:name=".ui.erp.activity.crm.BusinessDetailInfoActivity"
+            android:theme="@style/CrmThemeBlue"/>
+        <activity android:name=".ui.erp.activity.crm.BusinessLessActivity"
+            android:theme="@style/CrmThemeBlue"/>
+        <activity android:name=".ui.erp.activity.crm.BusinessTransferActivity"
+            android:theme="@style/CrmThemeBlue"/>
+        <activity android:name=".ui.erp.activity.crm.BusinessSelectCustomerActivity"
+            android:theme="@style/CrmThemeBlue"/>
         <activity
             android:name=".ui.message.uas.B2bMsgActivity"
             android:launchMode="singleTask" />
@@ -437,11 +444,15 @@
             android:configChanges="orientation|keyboardHidden"
             android:theme="@style/CrmThemeBlue"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
-        <activity android:name=".ui.erp.activity.crm.CustomerDetailActivity" />
-        <activity android:name=".ui.erp.activity.crm.CustomerListActivity" />
-        <activity android:name=".ui.erp.activity.crm.CustomerMutilSelectActivity" />
+        <activity android:name=".ui.erp.activity.crm.CustomerDetailActivity"
+            android:theme="@style/CrmThemeCustomer"/>
+        <activity android:name=".ui.erp.activity.crm.CustomerListActivity"
+            android:theme="@style/CrmThemeCustomer"/>
+        <activity android:name=".ui.erp.activity.crm.CustomerMutilSelectActivity"
+            android:theme="@style/CrmThemeCustomer"/>
         <activity
             android:name=".ui.erp.activity.crm.SalesRankingActivity"
+            android:theme="@style/CrmThemeRank"
             android:label="@string/title_activity_sales_ranking" />
         <activity
             android:name=".ui.erp.activity.crm.VisitReportAddActivity"
@@ -462,7 +473,8 @@
             android:configChanges="orientation|keyboardHidden"
             android:theme="@style/CrmThemeBlue"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
-        <activity android:name=".ui.erp.activity.crm.CustomerListSelectActivity" />
+        <activity android:name=".ui.erp.activity.crm.CustomerListSelectActivity"
+            android:theme="@style/CrmThemeCustomer"/>
         <activity android:name=".ui.erp.activity.oa.AddMeetMainActivity" />
         <activity
             android:name=".ui.erp.activity.oa.WorkLogsActivity"
@@ -510,7 +522,8 @@
         <activity
             android:name=".ui.erp.activity.oa.UserSelectActivity"
             android:label="选择人员" />
-        <activity android:name=".ui.erp.activity.crm.BusinessStateActivity" />
+        <activity android:name=".ui.erp.activity.crm.BusinessStateActivity"
+            android:theme="@style/CrmThemeBlue"/>
         <activity
             android:name=".ui.erp.activity.oa.AddMeetTaskActivity"
             android:label="会议任务" />

+ 3 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/base/BaseActivity.java

@@ -28,6 +28,8 @@ public abstract class BaseActivity extends ActionBackActivity {
     public CustomProgressDialog progressDialog;
     public Context ct;
     public Activity activity;
+    
+    public  void preOnCreacte(){};
 
     public BaseActivity() {
         super();
@@ -49,6 +51,7 @@ public abstract class BaseActivity extends ActionBackActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        preOnCreacte();
         ct=this;
         activity=this;
         setNotTouchEvent(true);

+ 4 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessDetailActivty.java

@@ -395,8 +395,10 @@ public class BusinessDetailActivty extends BaseActivity {
                     break;
                 case BUSINESS_FENPEI:
                     progressDialog.dismiss();
-                    ToastMessage("分配商机成功!");
-                    startActivity(new Intent(ct, BusinessActivity.class));
+                    Crouton.makeText(BusinessDetailActivty.this,45,"成功分配商机!",
+                            getResources().getColor(R.color.light_green),
+                            5000).show();
+                    sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page = 1);
                     break;
                 case CAN_QIANG_NOT:
                     JSONObject result = JSON.parseObject(msg.getData().getString("result"));

+ 7 - 5
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessTransferActivity.java

@@ -212,8 +212,8 @@ public class BusinessTransferActivity extends BaseActivity {
                     if (!items.isEmpty()){
                         for (int i=0;i<items.size();i++){
                             Business model = new Business();
-                            model.setName(items.getJSONObject(i).getString("DLC_VALUE"));
-                            model.setNum(items.getJSONObject(i).getString("DLC_DISPLAY"));
+                            model.setName(items.getJSONObject(i).getString("BD_NAME"));
+                           // model.setNum(items.getJSONObject(i).getString("DLC_DISPLAY"));
                             mData.add(model);
                         }
                     }
@@ -242,10 +242,12 @@ public class BusinessTransferActivity extends BaseActivity {
 
     private void sendHttpResquest(int what){
         progressDialog.show();
-        String url= Constants.getAppBaseUrl(ct)+"/mobile/crm/getBusinessChanceCombo.action";
+        ///mobile/crm/getNichehouse.action
+        ///mobile/crm/getBusinessChanceCombo.action
+        String url= Constants.getAppBaseUrl(ct)+"/mobile/crm/getNichehouse.action";
         Map<String,Object> params=new HashMap<>();
-        params.put("caller", "BusinessChance");
-        params.put("field", "bc_nichehouse");
+//        params.put("caller", "BusinessChance");
+//        params.put("field", "bc_nichehouse");
         LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");

+ 9 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/ClientActivity.java

@@ -461,11 +461,16 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
             }
             @Override
             public String getFormattedValue(float value) {
-                if (value==0){
-                    return "0";
-                }else {
-                    return mFormat.format(value);
+                try {
+                    if (value==0){
+                        return "0";
+                    }else {
+                        return mFormat.format(value);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
+                return "";
             }
         });
         dataSets1.clear();

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerAddActivity.java

@@ -336,7 +336,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
         Map<String, Object> params = new HashMap<>();
         params.put("formStore", formStore);
         if(type==1){
-            url= Constants.getAppBaseUrl(ct) + "scm/sale/saveCustomer.action";
+            url= Constants.getAppBaseUrl(ct) + "scm/sale/saveCustomerBase.action";
             params.put("caller", "Customer");
         }else{
             params.put("caller", "PreCustomer");

+ 2 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportAddActivity.java

@@ -340,6 +340,8 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                         for (int i = 0; i < array.size(); i++) {
                             if (value.equals(array.getJSONObject(i).getString("CU_NAME"))) {
                                 vp_code = array.getJSONObject(i).getString("CU_CODE");
+                                tv_linksman_login.setText(array.getJSONObject(i).getString("CU_CONTACT"));
+                                tv_address_login.setText(array.getJSONObject(i).getString("CU_ADD1"));
                             }
                         }
                     }

+ 9 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OAActivity.java

@@ -6,6 +6,7 @@ import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -191,9 +192,16 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         return beans;
     }
 
+    @Override
+    public void preOnCreacte() {
+        setTheme(R.style.CrmThemeVisit);
+        Log.i(TAG, "preOnCreacte:");
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Log.i(TAG, "onCreate:");
         setContentView(R.layout.activity_oa);
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("自动化办公");
@@ -319,6 +327,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         if (getIntent() == null || getIntent().getIntExtra("type", 0) != 1) return;
         oa_rl_choose.setVisibility(View.GONE);
         getSupportActionBar().setTitle("客户拜访");
+        
     }
 
     //获取数据

+ 25 - 1
WeiChat/src/main/res/values-v14/styles.xml

@@ -22,10 +22,20 @@
     <style name="CrmThemeBlue" parent="AppBaseThemeBule">
         <item name="actionBarStyle">@style/CRM_Ttile_Bule</item>
     </style>
+    <style name="CrmThemeCustomer" parent="AppBaseThemeBule">
+        <item name="actionBarStyle">@style/CRM_Ttile_Customer</item>
+    </style>
+    <style name="CrmThemeVisit" parent="AppBaseThemeBule">
+        <item name="actionBarStyle">@style/CRM_Ttile_Visit</item>
+    </style>
+    <style name="CrmThemeRank" parent="AppBaseThemeBule">
+        <item name="actionBarStyle">@style/CRM_Ttile_Rank</item>
+    </style>
     <style name="CrmThemeTask" parent="AppBaseThemeBule">
         <item name="actionBarStyle">@style/CRM_Ttile_Task</item>
     </style>
    
+   
     <style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="android:buttonStyle">@android:style/Widget.Button</item>
         <item name="android:windowAnimationStyle">@style/IMAnimationStyle</item>
@@ -49,7 +59,21 @@
         <item name="android:background">@color/crm_title_task</item>
         <item name="background">@color/crm_title_task</item>
     </style>
-    
+
+    <style name="CRM_Ttile_Visit" parent="IMActionBar">
+        <item name="android:background">@color/titleVisit</item>
+        <item name="background">@color/titleVisit</item>
+    </style>
+
+    <style name="CRM_Ttile_Customer" parent="IMActionBar">
+        <item name="android:background">@color/titleCustomer</item>
+        <item name="background">@color/titleCustomer</item>
+    </style>
+
+    <style name="CRM_Ttile_Rank" parent="IMActionBar">
+        <item name="android:background">@color/titleRank</item>
+        <item name="background">@color/titleRank</item>
+    </style>
     <style name="IMActionBar" parent="Widget.AppCompat.ActionBar">
         <item name="android:actionBarSize">11dp</item>
         <item name="android:icon">@drawable/action_bar_divider</item>

+ 7 - 1
WeiChat/src/main/res/values/colors.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-   <color name="crm_title_task">#91B43D</color>
+   <color name="crm_title_task">#D0A233</color>
     <!--by gongpengming-->
     <color name="subscrip_text">#60a0a0a0</color>
     <color name="item_color1">#30a0a0a0</color>
@@ -222,7 +222,13 @@
     <color name="green">#008000</color> <!-- 绿色 -->
     <color name="darkgreen">#006400</color> <!-- 暗绿色 -->
     <color name="blue">#0000FF</color> <!-- 蓝色 -->
+    <!--标题栏颜色-->
     <color name="titleBlue">#3C97D7</color> <!-- 青蓝色 -->
+    <color name="titleCustomer">#DF8339</color>
+    <color name="titleVisit">#6FB660</color>
+     <color name="titleTask">#D0A233</color>
+     <color name="titleRank">#D0A233</color>
+ 
   
     <color name="mediumblue">#0000CD</color> <!-- 中兰色 -->
     <color name="darkblue">#00008B</color> <!-- 暗蓝色 -->