yang_div 8 lat temu
rodzic
commit
205897d438

+ 0 - 2
app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java

@@ -141,8 +141,6 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                 Jump2View.getInstance().goTaskList2View(getActivity(), null);
                 break;
             case R.id.proxy_service_layout://代理
-                Jump2View.getInstance().goSignCardAct(getActivity(), "3");
-//                Jump2View.getInstance().goSignCardAct(activity, balance);
                 G.showToast("敬请期待!");
                 break;
             case R.id.abourt_us_layout://关于我们

+ 1 - 1
app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -233,7 +233,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     }
 
 
-    String balance ="0";//余额
+   public static String balance ="0";//余额(打卡界面需要用到余额来判断支付方式)//by div RN代码中需要用到,不知道怎么传过去,先这样吧
 
     private void refalsh() {
 

+ 2 - 1
app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -14,6 +14,7 @@ import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadTarget;
 import com.arialyy.aria.core.inf.IEntity;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
+import com.kfzs.duanduan.fragment.FgtSmallSheep;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
 import com.sheep.gamegroup.model.entity.RequestParameEty;
@@ -361,7 +362,7 @@ public class CommonUtil {
                 Jump2View.getInstance().goTryplayView(context, 1);
                 break;
             case 9://打卡赚钱
-                Jump2View.getInstance().goSignCardAct(context, null);
+                Jump2View.getInstance().goSignCardAct(context, FgtSmallSheep.balance);
                 break;
             case 98://内部WebView加载H5
                 Jump2View.getInstance().goWeb(context, entity.getUrl(), entity.getTitle());

+ 7 - 2
app/src/main/java/com/sheep/gamegroup/view/activity/SignCardAct.java

@@ -66,6 +66,8 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
     TextView signTvMrcyrs;
     @BindView(R.id.sign_tv_yybm)
     TextView signTvYybm;
+    @BindView(R.id.sign_tv_kf)
+    TextView signTvKf;
 
     String person ="0";
     String balance;
@@ -141,6 +143,7 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
         if("OK".equals(o.getMsg())){
 //            showToast("报名成功");
             ViewUtil.showSignPay(activity);
+            presenter.goPunchAndSignCount();//(刷新数据)获取可打卡和报名人数
         }else {
             showToast(o.getMsg());
         }
@@ -221,7 +224,7 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
         showToast(o.getMsg());
     }
 
-    @OnClick({R.id.sign_tv_ljdk, R.id.sign_tv_yybm})
+    @OnClick({R.id.sign_tv_ljdk, R.id.sign_tv_yybm, R.id.sign_tv_kf})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.sign_tv_ljdk://打卡
@@ -233,7 +236,9 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
                 }else {
                     Jump2View.getInstance().goSignRechargeAct(activity,null);
                 }
-
+                break;
+            case R.id.sign_tv_kf:
+                showToast("028-8888888");
                 break;
         }
     }

+ 2 - 0
app/src/main/res/layout/sign_card_layout.xml

@@ -256,6 +256,7 @@
 
 
                 <TextView
+                    android:id="@+id/sign_tv_kf"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
@@ -265,6 +266,7 @@
                     android:text="还有疑问?联系客服"
                     android:layout_marginBottom="@dimen/content_padding_15"
                     android:textColor="#262bfa"
+                    android:visibility="invisible"
                     android:textSize="@dimen/text_size_12" />
             </LinearLayout>
 

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -31,7 +31,7 @@
     <string name="input_notice_feedback">请留下您的联系方式,我们会不定期地给予优质建议提供丰厚奖励哦!</string>
     <string name="accessibility_desc">小绵羊任务</string>
     <string name="sign_card_text">·每日<font color="red">00:00-23:59:00</font>之间支付<font color="red">1</font>元,即可有机会参与次日打卡活动;\n·次日早晨<font color="red">07:00-09:00</font>时间段参与打卡后,可平分前日奖金池内全部现金,
-    打卡失败则不可参与当日奖金分配;\n·每日平分金额于早9点后开始结算,系统将于12小时内发放到个人账户,因网络原因,部分用户
+    打卡失败则不可参与当日奖金分配;\n·若当日无人参与打卡平分现金活动,则今日奖池金额累加到明日奖池中\n·每日平分金额于早9点后开始结算,系统将于12小时内发放到个人账户,因网络原因,部分用户
     可能出现不及时到账的情况,可与我们客户联系,感谢您的谅解。\n·本活动最终解释权归橙风有量科技有限公司所有.</string>
 
     <string name="sign_record_money">%s元</string>