crm开发 ---主界面大家完成

WeiChat/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.xzjmyk.pm.activity"
     android:versionCode="45"
-    android:versionName="4.5" >
+    android:versionName="4.5">
 
     <uses-sdk
         android:minSdkVersion="11"
@@ -69,7 +69,7 @@
         android:allowBackup="true"
         android:icon="@drawable/uuu"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme">
         <meta-data
             android:name="UMENG_APPKEY"
             android:value="574504a167e58eec520017df" />
@@ -80,7 +80,7 @@
         <!-- 启动页面 -->
         <activity
             android:name=".ui.SplashActivity"
-            android:theme="@style/SplashTheme" >
+            android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -240,7 +240,7 @@
             android:exported="true"
             android:icon="@drawable/ic_chooser"
             android:label="@string/choose_file"
-            android:theme="@style/ChooserTheme" >
+            android:theme="@style/ChooserTheme">
             <intent-filter>
                 <action android:name="android.intent.action.GET_CONTENT" />
 
@@ -257,13 +257,13 @@
             android:enabled="@bool/use_provider"
             android:exported="true"
             android:grantUriPermissions="true"
-            android:permission="android.permission.MANAGE_DOCUMENTS" >
+            android:permission="android.permission.MANAGE_DOCUMENTS">
             <intent-filter>
                 <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
             </intent-filter>
         </provider>
 
-        <receiver android:name=".broadcast.ScrenLockedBroadCastReceiver" >
+        <receiver android:name=".broadcast.ScrenLockedBroadCastReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.SCREEN_OFF" />
                 <action android:name="android.intent.action.SCREEN_ON" />
@@ -290,7 +290,7 @@
         <!-- 用于接收系统消息以保证PushService正常运行 -->
         <receiver
             android:name="com.baidu.android.pushservice.PushServiceReceiver"
-            android:process=":bdservice_v1" >
+            android:process=":bdservice_v1">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
@@ -306,7 +306,7 @@
         <!-- Push服务接收客户端发送的各种请求 -->
         <receiver
             android:name="com.baidu.android.pushservice.RegistrationReceiver"
-            android:process=":bdservice_v1" >
+            android:process=":bdservice_v1">
             <intent-filter>
                 <action android:name="com.baidu.android.pushservice.action.METHOD" />
                 <action android:name="com.baidu.android.pushservice.action.BIND_SYNC" />
@@ -325,7 +325,7 @@
             android:name="com.baidu.android.pushservice.PushService"
             android:exported="true"
             android:persistent="true"
-            android:process=":bdservice_v1" >
+            android:process=":bdservice_v1">
             <intent-filter>
                 <action android:name="com.baidu.android.pushservice.action.PUSH_SERVICE" />
             </intent-filter>
@@ -339,7 +339,7 @@
 
 
         <!-- 此处Receiver名字修改为当前包名路径 -->
-        <receiver android:name=".ui.PushNetMessageReceiver" >
+        <receiver android:name=".ui.PushNetMessageReceiver">
             <intent-filter>
 
                 <!-- 接收push消息 -->
@@ -360,7 +360,7 @@
             </intent-filter>
         </activity>
         -->
-        <activity android:name=".ui.message.SelectCardActivity" >
+        <activity android:name=".ui.message.SelectCardActivity">
             <intent-filter>
                 <action android:name="com.xzjmyk.pm.activity.ui.message.SelectCardActivity" />
             </intent-filter>
@@ -384,7 +384,7 @@
 
         <receiver
             android:name="com.baidu.autoupdatesdk.receiver.BDBroadcastReceiver"
-            android:exported="false" >
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.baidu.autoupdatesdk.ACTION_NEW_UPDATE" />
                 <action android:name="com.baidu.autoupdatesdk.ACTION_DOWNLOAD_COMPLETE" />
@@ -423,15 +423,13 @@
         <activity android:name=".ui.erp.activity.oa.OutofficeActivity" />
         <activity android:name=".ui.erp.activity.oa.MeetDetailsActivity" />
         <activity android:name=".ui.erp.activity.oa.OARegisterActivity" />
-        android:launchMode="singleTask" />
         <activity android:name=".ui.erp.activity.crm.CustomerAddActivity" />
         <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.SalesRankingActivity"
-            android:label="@string/title_activity_sales_ranking"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:label="@string/title_activity_sales_ranking" />
         <activity android:name=".ui.erp.activity.crm.VisitReportAddActivity" />
         <activity android:name=".ui.erp.activity.crm.VisitReportPlanActivity" />
         <activity android:name=".ui.erp.activity.crm.AddressSelectActivity" />
@@ -441,10 +439,8 @@
         <activity android:name=".ui.erp.activity.oa.WorkLogsActivity" />
         <activity android:name=".ui.erp.activity.oa.AddSigninActivity" />
         <activity android:name=".ui.erp.activity.oa.AddNextSigninActivity" />
-        <activity android:name=".ui.erp.activity.oa.SigninTimeSetActivity" >
-        </activity>
-        <activity android:name=".ui.erp.activity.oa.SuperSetActivity" >
-        </activity>
+        <activity android:name=".ui.erp.activity.oa.SigninTimeSetActivity"></activity>
+        <activity android:name=".ui.erp.activity.oa.SuperSetActivity"></activity>
     </application>
 
 </manifest>

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

@@ -22,6 +22,7 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
     private void initView() {
         findViewById(R.id.meet_main_rl).setOnClickListener(this);
     }
+
     @Override
     public void onClick(View view) {
         switch (view.getId()) {

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

@@ -16,6 +16,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.XutilsFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.crm.ClientActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -94,7 +95,7 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
                 break;
             case R.id.rl_uas_sys:
 //                ct.startActivity(new Intent(ct, ErpMenActivity.class));
-                        ct.startActivity(new Intent(ct, OAActivity.class));
+                ct.startActivity(new Intent(ct, OAActivity.class));
                 break;
             case R.id.my_client_rl:
                 ct.startActivity(new Intent(ct, ClientActivity.class));

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

@@ -916,7 +916,7 @@ public class MessageFragment extends EasyFragment {
                         task_num++;
                     } else if (allProcesses.get(i).getTypecode()
                             .contains("dingyue")) {
-                        if (allProcesses.get(i).getStatus() == "0"){
+                        if (allProcesses.get(i).getStatus() == "0") {
 
                             pagin_num++;
                         }

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/oa_rb_pass" android:state_checked="true" android:state_enabled="true"/>
-    <item android:drawable="@drawable/oa_rb"/>
+    <item android:drawable="@drawable/oa_rb_pass" android:state_checked="true" android:state_enabled="true" />
+    <item android:drawable="@drawable/oa_rb" />
 </selector>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/oa_signin_play_pass" android:state_checked="true" android:state_enabled="true"/>
-    <item android:drawable="@drawable/oa_signin_play"/>
+    <item android:drawable="@drawable/oa_signin_play_pass" android:state_checked="true" android:state_enabled="true" />
+    <item android:drawable="@drawable/oa_signin_play" />
 </selector>

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

@@ -15,5 +15,4 @@
         android:dividerHeight="2px" />
 
 
-
 </RelativeLayout>

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

@@ -4,48 +4,47 @@
     android:background="@drawable/login_bg">
 
 
-
-        <LinearLayout
+    <LinearLayout
+            android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="70dp"
+        android:orientation="vertical">
+
+        <com.xzjmyk.pm.activity.view.ClearEditText
+            android:id="@+id/phone_numer_edit"
+            style="@style/IMLineEditText"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:background="@color/wirtehine"
+            android:drawableLeft="@drawable/login_user_name"
+            android:hint="@string/please_input_phone_number"
+            android:inputType="phone" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp" />
+
+        <com.xzjmyk.pm.activity.view.ClearEditText
+            android:id="@+id/password_edit"
+            style="@style/IMLineEditPass"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:background="@color/wirtehine"
+            android:drawableLeft="@drawable/loginpw"
+            android:hint="@string/please_input_password" />
+
+        <Button
+            android:id="@+id/login_btn"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="70dp"
-            android:orientation="vertical">
-
-            <com.xzjmyk.pm.activity.view.ClearEditText
-                android:id="@+id/phone_numer_edit"
-                style="@style/IMLineEditText"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:background="@color/wirtehine"
-                android:drawableLeft="@drawable/login_user_name"
-                android:hint="@string/please_input_phone_number"
-                android:inputType="phone" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp" />
-
-            <com.xzjmyk.pm.activity.view.ClearEditText
-                android:id="@+id/password_edit"
-                style="@style/IMLineEditPass"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:background="@color/wirtehine"
-                android:drawableLeft="@drawable/loginpw"
-                android:hint="@string/please_input_password" />
-
-            <Button
-                android:id="@+id/login_btn"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginLeft="40dp"
-                android:layout_marginRight="40dp"
-                android:layout_marginTop="10dp"
-                android:background="@drawable/bg_btn"
-                android:text="登  录"
-                android:textColor="@color/white" />
-        </LinearLayout>
+            android:layout_height="50dp"
+            android:layout_marginLeft="40dp"
+            android:layout_marginRight="40dp"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/bg_btn"
+            android:text="登  录"
+            android:textColor="@color/white" />
+    </LinearLayout>
 
 
 </RelativeLayout>

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

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-  >
+    android:layout_height="match_parent">
 
     <RelativeLayout
         android:clickable="true"
         android:id="@+id/top"
         style="@style/IMTbleLine">
-        <TextView
+
+    <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"

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

@@ -4,7 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.WorkLogsActivity">
-    <com.handmark.pulltorefresh.library.PullToRefreshListView
+
+<com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/listView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
 

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto" >
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/add"

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto" >
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/oa_alarma"
         android:icon="@drawable/alarm"