Browse Source

Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_raomeng

RaoMeng 7 years ago
parent
commit
ff97182e45

+ 7 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -40,6 +40,7 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
+import com.common.preferences.RedSpUtil;
 import com.common.system.DisplayUtil;
 import com.common.system.PermissionUtil;
 import com.core.adapter.ItemPopListAdapter;
@@ -215,6 +216,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener, On
     };
     private Boolean platform;
     private FrameLayout vg;
+    private View workCardRedTv;
 
     public MeFragment() {
     }
@@ -317,6 +319,9 @@ public class MeFragment extends EasyFragment implements View.OnClickListener, On
         View workCardRl = findViewById(R.id.workCardRl);
         workCardRl.setVisibility(View.VISIBLE);
         workCardRl.setOnClickListener(this);
+        workCardRedTv = findViewById(R.id.workCardRedTv);
+        workCardRedTv.setVisibility(RedSpUtil.api().getBoolean("workCardClicked",false)?View.GONE:View.VISIBLE);
+
         findViewById(R.id.my_friend_rl).setOnClickListener(this);
         findViewById(R.id.my_space_rl).setOnClickListener(this);
         findViewById(R.id.local_video_rl).setOnClickListener(this);
@@ -501,6 +506,8 @@ public class MeFragment extends EasyFragment implements View.OnClickListener, On
         int id = v.getId();
         switch (id) {
             case R.id.workCardRl:
+                workCardRedTv.setVisibility(View.GONE);
+                RedSpUtil.api().put("workCardClicked",true);
                 startActivity(new Intent(ct, WorkCardActivity.class));
                 break;
             case R.id.rl_company_change://公司切换

BIN
app_core/common/src/main/res/drawable-hdpi/icon_my_scheduler.png


BIN
app_core/common/src/main/res/drawable-xhdpi/icon_my_scheduler.png


BIN
app_core/common/src/main/res/drawable-xxhdpi/icon_my_scheduler.png


+ 12 - 1
app_core/common/src/main/res/layout/fragment_me.xml

@@ -485,7 +485,18 @@
                 android:layout_alignParentBottom="true"
                 android:background="@color/item_line" />
 
-
+            <TextView
+                android:id="@+id/workCardRedTv"
+                android:layout_width="10dp"
+                android:layout_height="10dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerInParent="true"
+                android:layout_marginRight="23dp"
+                android:layout_marginTop="12dp"
+                android:visibility="gone"
+                android:background="@drawable/hongdian"
+                android:textColor="@android:color/white"
+                android:textSize="10.0dip" />
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"