测试版本

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -85,6 +85,7 @@ import com.uas.appme.pedometer.utils.StepUtils;
 import com.uas.appme.settings.activity.FeedbackActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
+import com.xzjmyk.pm.activity.ui.erp.fragment.WorkPlatFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
 import com.xzjmyk.pm.activity.ui.find.MyFriendFragment;
 import com.xzjmyk.pm.activity.ui.me.MeFragment;
@@ -138,8 +139,8 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
 	private Fragment mLastFragment;
 	private MessageFragment mMessageFragment;
 	private MyFriendFragment mMyFriendFragment;//我的朋友---相互关注，单项关注，房间
-//	private WorkPlatFragment mWorksFragment;//工作
-	private WorksFragment mWorksFragment;//工作
+	private WorkPlatFragment mWorksFragment;//工作
+//	private WorksFragment mWorksFragment;//工作
 	
 	private GroupChatFragment mGroupChatFragment;//群聊
 	private MeFragment mMeFragment;//我
@@ -290,7 +291,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
 
 			} else if (checkedId == R.id.main_tab_three) {  //点击工作选项
 				if (mWorksFragment == null) {
-					mWorksFragment = new WorksFragment();
+					mWorksFragment = new WorkPlatFragment();
 				}
 				changeFragment(mWorksFragment, TAG_NEARBY);
 				getSupportActionBar().setTitle(R.string.usoft_science);
@@ -894,7 +895,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
 		mLastFragment = getSupportFragmentManager().findFragmentById(R.id.main_content);
 		mMessageFragment = (MessageFragment) getSupportFragmentManager().findFragmentByTag(TAG_MESSAGE);
 		mMyFriendFragment = (MyFriendFragment) getSupportFragmentManager().findFragmentByTag(TAG_MY);
-		mWorksFragment = (WorksFragment) getSupportFragmentManager().findFragmentByTag(TAG_NEARBY);
+		mWorksFragment = (WorkPlatFragment) getSupportFragmentManager().findFragmentByTag(TAG_NEARBY);
 		mGroupChatFragment = (GroupChatFragment) getSupportFragmentManager().findFragmentByTag(TAG_GROUP_CHAT);
 		mMeFragment = (MeFragment) getSupportFragmentManager().findFragmentByTag(TAG_ME);
 		mBusinessCircleFragment = (ContactsFragment) getSupportFragmentManager().findFragmentByTag(TAG_BusinessCircle);

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/UserRoleUtils.java

@@ -7,7 +7,7 @@ import com.core.app.MyApplication;
 import com.core.app.R;
 import com.core.utils.CommonUtil;
 import com.uas.appme.settings.activity.SettingActivity;
-import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
+import com.xzjmyk.pm.activity.ui.erp.fragment.WorkPlatFragment;
 import com.xzjmyk.pm.activity.ui.me.MeFragment;
 import com.xzjmyk.pm.activity.ui.message.MessageFragment;
 
@@ -33,7 +33,7 @@ public class UserRoleUtils {
                         view.findViewById(R.id.waitting_work_rl).setVisibility(View.GONE);//待办工作
                         view.findViewById(R.id.subscribe_rl).setVisibility(View.GONE);//我的订阅
                     }
-                    if (fragment instanceof WorksFragment){
+                    if (fragment instanceof WorkPlatFragment){
                         view.findViewById(R.id.rl_uas_sys).setVisibility(View.GONE);
                         view.findViewById(R.id.my_client_rl).setVisibility(View.GONE);
                         view.findViewById(R.id.setting_rl).setVisibility(View.GONE);
@@ -53,7 +53,7 @@ public class UserRoleUtils {
                         view.findViewById(R.id.waitting_work_rl).setVisibility(View.VISIBLE);//待办工作
                         view.findViewById(R.id.subscribe_rl).setVisibility(View.VISIBLE);//我的订阅
                     }
-                    if (fragment instanceof WorksFragment){
+                    if (fragment instanceof WorkPlatFragment){
                         view.findViewById(R.id.rl_uas_sys).setVisibility(View.VISIBLE);
                         view.findViewById(R.id.my_client_rl).setVisibility(View.VISIBLE);
                         view.findViewById(R.id.setting_rl).setVisibility(View.VISIBLE);
@@ -73,7 +73,7 @@ public class UserRoleUtils {
                         view.findViewById(R.id.waitting_work_rl).setVisibility(View.GONE);//待办工作
                         view.findViewById(R.id.subscribe_rl).setVisibility(View.GONE);//我的订阅
                     }
-                    if (fragment instanceof WorksFragment){
+                    if (fragment instanceof WorkPlatFragment){
                        // view.findViewById(R.id.rl_uas_sys).setVisibility(View.GONE);
                         view.findViewById(R.id.my_client_rl).setVisibility(View.GONE);
                         view.findViewById(R.id.setting_rl).setVisibility(View.GONE);

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

@@ -16,14 +16,15 @@
             android:layout_width="6dp"
             android:layout_height="12dp"
             android:layout_marginLeft="10dp"
-            android:background="@color/titleBlue"/>
+            android:background="@color/titleBlue" />
 
         <TextView
             android:id="@+id/work_parent_title_tv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textSize="14sp"
-            android:padding="6dp"/>
+            android:padding="6dp"
+            android:textColor="@color/black"
+            android:textSize="14sp" />
     </LinearLayout>
 
     <com.core.widget.view.MyGridView

app_core/common/src/main/assets/work_menu.json

@@ -262,7 +262,7 @@
         "isLocalMenu": true,
         "menuName": "一元捐",
         "menuIcon": "ic_work_charitable_donations",
-        "menuActivity": "",
+        "menuActivity": "com.modular.work.CharitableActivity",
         "menuUrl": "",
         "caller": "",
         "isHide": false

app_core/common/src/main/assets/work_menu_b2b.json

@@ -127,7 +127,7 @@
         "isLocalMenu": true,
         "menuName": "一元捐",
         "menuIcon": "ic_work_charitable_donations",
-        "menuActivity": "",
+        "menuActivity": "com.modular.work.CharitableActivity",
         "menuUrl": "",
         "caller": "",
         "isHide": false

app_core/common/src/main/assets/work_menu_personal.json

@@ -37,7 +37,7 @@
         "isLocalMenu": true,
         "menuName": "一元捐",
         "menuIcon": "ic_work_charitable_donations",
-        "menuActivity": "",
+        "menuActivity": "com.modular.work.CharitableActivity",
         "menuUrl": "",
         "caller": "",
         "isHide": false

app_modular/appworks/src/main/AndroidManifest.xml

@@ -227,7 +227,12 @@
             android:label="@string/charitable"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateUnspecified|adjustNothing" />
+            android:windowSoftInputMode="stateUnspecified|adjustNothing">
+            <intent-filter>
+                <action android:name="com.modular.work.CharitableActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <activity android:name=".OA.platform.activity.CharitSearchActivity" />
         <activity android:name=".OA.platform.activity.JoinCharitActivity"></activity>
 
@@ -288,11 +293,14 @@
             </intent-filter>
         </activity>
         <activity android:name=".OA.platform.activity.JoinCharitActivity" />
-        <activity android:name=".CRM.erp.activity.DeviceManageActivity"
-            android:label="@string/title_device_manage"/>
-        <activity android:name=".CRM.erp.activity.ScanDetailActivity"
-            android:label="@string/text_scan_device"/>
-        <activity android:name=".CRM.erp.activity.DeviceInputListActivity"
-            android:label="@string/title_device_manage"/>
+        <activity
+            android:name=".CRM.erp.activity.DeviceManageActivity"
+            android:label="@string/title_device_manage" />
+        <activity
+            android:name=".CRM.erp.activity.ScanDetailActivity"
+            android:label="@string/text_scan_device" />
+        <activity
+            android:name=".CRM.erp.activity.DeviceInputListActivity"
+            android:label="@string/title_device_manage" />
     </application>
 </manifest>

app_modular/appworks/src/main/res/layout/activity_work_module_sort.xml

@@ -3,15 +3,15 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="#81A6C1"
+    android:layout_height="match_parent"
+    android:background="#e9f0f5"
     android:focusable="true"
     android:focusableInTouchMode="true">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="#81A6C1"
+        android:background="#e9f0f5"
         android:orientation="vertical">
 
         <TextView