3.6.8

app/src/main/java/com/sheep/gamegroup/module/home/fragment/FgtHome.java

@@ -9,6 +9,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSONObject;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -55,6 +56,8 @@ public class FgtHome extends BaseFragment {
     View line_recommend;
     @BindView(R.id.line_news)
     View line_news;
+    @BindView(R.id.meet_btn)
+    View meet_btn;
 
     private UserEntity user;
 
@@ -101,6 +104,11 @@ public class FgtHome extends BaseFragment {
         Jump2View.getInstance().gotoYfShop(getActivity());
     }
 
+    @OnClick(R.id.meet_btn)
+    public void onMeetClick() {
+        Jump2View.getInstance().gotoYYShop(getActivity());
+    }
+
     @OnClick({R.id.recommend_btn, R.id.news_btn})
     public void onTabClick(View v) {
         boolean isRecommend = v.getId() == R.id.recommend_btn;

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -2796,6 +2796,14 @@ public class Jump2View {
         });
     }
 
+    public void gotoYYShop(Context activity) {
+        CommonUtil.getInstance().initUrlConfigByNet(Config.KEY_YY_SHOP_URL, url -> {
+            if (TextUtils.isEmpty(url))
+                url = "http://smallstation.9yan.io/yy_shop/#/pages/index/index";
+            goWeb(activity, new WebParams(url, Config.YY_SHOP_NAME));
+        });
+    }
+
     //点击一条消息
     public void onClickSystemNotification(Activity activity, SystemNotification item) {
         switch (item.getType()) {//消息类型 1:通知 2:活动 3:模块上线 4:任务上线 5:任务成功 6:任务失败

app/src/main/java/com/sheep/gamegroup/view/activity/RechargeAct.java

@@ -367,21 +367,22 @@ public class RechargeAct extends BaseActivity {
         CommonUtil.getInstance().alipay(this, payInfo, true, new AbsObserver<String>() {
             @Override
             public void onNext(String result) {
+
                 LogUtil.println(ActVip.class.getSimpleName(), String.format(Locale.CHINA, "alipay onNext('%s')", result));
                 if ("9000".equals(result)) {
                     ApiJSONUtil.missionExecute(4);
                 }
-                if ("9000".equals(result)) {
-                    Intent intent = new Intent();
-                    intent.putExtra("amount", Integer.parseInt(mAmount));
-                    setResult(777, intent);
-                } else {
+//                if ("9000".equals(result)) {
+//                    Intent intent = new Intent();
+//                    intent.putExtra("amount", Integer.parseInt(mAmount));
+//                    setResult(777, intent);
+//                } else {
                     if (forResult) {
                         Jump2View.getInstance().goRechargeResult(RechargeAct.this, result, fromPackage, fromOrient, null);
                     } else {
                         Jump2View.getInstance().goRechargeResultAct(RechargeAct.this, result);
                     }
-                }
+//                }
                 finish();
             }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java

@@ -14,6 +14,7 @@ public class Config {
 
     //有范商城
     public final static String YF_SHOP_NAME = "有范商城";
+    public final static String YY_SHOP_NAME = "遇见商城";
     public final static String YF_SHOP_PLATFORM = "android.sheep.app";
     public final static String YF_SHOP_HOME = "http://shop.17xmy.com/mobile/";//有范商城主页地址
     public final static String YF_SHOP_HOME_SHEEP = "http://shop.17xmy.com/mobile/?pf=android.sheep.app";//小绵羊加载的有范商城主页地址
@@ -53,6 +54,7 @@ public class Config {
     //path
     //有范商城地址的 key
     public static final String KEY_YF_SHOP_URL = "yf_shop_url";
+    public static final String KEY_YY_SHOP_URL = "yy_shop_url";
     //龙猫竞猜分享地址 key
     public static final String KEY_LMJC_URL = "lmjc_url";
     //充值VIP地址的 key

app/src/main/res/layout/fgt_home.xml

@@ -90,6 +90,18 @@
                 android:layout_width="30dp"
                 android:layout_height="wrap_content" />
         </RelativeLayout>
+        <RelativeLayout
+            android:id="@+id/meet_btn"
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:visibility="gone"
+            android:layout_height="match_parent">
+            <ImageView
+                android:layout_margin="4dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:src="@drawable/btn_meet"/>
+        </RelativeLayout>
     </LinearLayout>
 
     <FrameLayout

gradle.properties

@@ -17,8 +17,8 @@
 # org.gradle.parallel=true
 #android.injected.build.model.only.versioned = 3
 
-VERSION_NAME=3.6.7
-VERSION_CODE=3006007
+VERSION_NAME=3.6.8
+VERSION_CODE=3006008
 ANDROID_COMPILE_SDK_VERSION=28
 ANDROID_MIN_SDK_VERSION=17
 ANDORID_TARGET_SDK_VERSION=28