1.0.0发版

highgold/app/build.gradle

@@ -11,7 +11,7 @@ android {
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
         versionCode 1
-        versionName "1.2.9"
+        versionName "1.0.0"
         flavorDimensions "default"
 
         // dex突破65535的限制
@@ -120,7 +120,7 @@ android {
         qh360 {}
         yingyongbao {}
         oppo {}
-        mints {}
+        highgold {}
         vivo {}
     }
 

highgold/app/src/main/java/com/mints/highgold/MintsApplication.java

@@ -145,7 +145,7 @@ public class MintsApplication extends MultiDexApplication {
         initRudenessScreen();
 
         // TalkingData数据埋点与错误日志
-//        TalkingDataConfig();
+        TalkingDataConfig();
 
         // 判断应用是否在前台
         ForegroundOrBackground.init(this);
@@ -157,10 +157,10 @@ public class MintsApplication extends MultiDexApplication {
 //        initGold(this);
 
         // 初始化ShareSDK
-//        MobSDK.init(this);
+        MobSDK.init(this);
 
         // 友盟初始化
-//        initUm(this);
+        initUm(this);
 
         //logger
         BindLogger();
@@ -173,7 +173,7 @@ public class MintsApplication extends MultiDexApplication {
 //        TTAdManagerHolder.init(this);
 
         // 极光推送
-//        BindJpush();
+        BindJpush();
 
         // 百度视频
 //        initBaiduVedio();
@@ -248,7 +248,7 @@ public class MintsApplication extends MultiDexApplication {
          * 参数4:设备类型，必须参数，传参数为UMConfigure.DEVICE_TYPE_PHONE则表示手机；传参数为UMConfigure.DEVICE_TYPE_BOX则表示盒子；默认为手机。
          * 参数5:Push推送业务的secret，需要集成Push功能时必须传入Push的secret，否则传空。
          */
-        UMConfigure.init(context, "5db5876b570df381430007da", CommonUtils.getAppMetaData(context, "CHANNEL_NAME"), UMConfigure.DEVICE_TYPE_PHONE, "");
+        UMConfigure.init(context, "5e8e9b06895ccaee78000032", CommonUtils.getAppMetaData(context, "CHANNEL_NAME"), UMConfigure.DEVICE_TYPE_PHONE, "");
     }
 
     /**
@@ -360,8 +360,8 @@ public class MintsApplication extends MultiDexApplication {
         YLUIInit.getInstance()
                 .setCrashOpen(false)
                 .setApplication(this)
-                .setAccessKey("yl9u9jlth8wg")
-                .setAccessToken("whgsojm7b9t4tpkr5hhd261byllsb6ea")
+                .setAccessKey("yleoq95t1aro")
+                .setAccessToken("m8de8rdyqiulcymymijh32pgq9pxgh9xZ")
                 .build();
 
         //页面个性化配置

highgold/app/src/main/java/com/mints/highgold/manager/ShumeiManager.java

@@ -21,7 +21,7 @@ public class ShumeiManager {
     /**
      * 应用标识，登录数美后台应用管理查看。
      */
-    public static final String APP_ID = "mints";
+    public static final String APP_ID = "mints_high";
     /**
      * 加密 KEY。
      */

highgold/app/src/main/java/com/mints/highgold/net/LoanService.java

@@ -5,6 +5,7 @@ import android.text.TextUtils;
 
 import com.google.gson.JsonObject;
 import com.mints.highgold.BuildConfig;
+import com.mints.highgold.common.Constant;
 import com.mints.highgold.mvp.model.AlipayBindBean;
 import com.mints.highgold.mvp.model.BannerBean;
 import com.mints.highgold.mvp.model.BaseResponse;
@@ -26,6 +27,7 @@ import com.mints.highgold.mvp.model.UserVersusBean;
 import com.mints.highgold.mvp.model.Version;
 import com.mints.highgold.mvp.model.WaterMsgBean;
 import com.mints.highgold.utils.AESUtils;
+import com.mints.highgold.utils.SPUtil;
 import com.orhanobut.logger.Logger;
 
 import java.util.Map;
@@ -505,32 +507,32 @@ public interface LoanService {
             builder.interceptors().add(okHttpInterceptor);
 
             Retrofit retrofit;
-//            if (BuildConfig.DEBUG) {
-//                SPUtil spUtil = SPUtil.getInstance(context);
-//                if (TextUtils.isEmpty(spUtil.getString(Constant.LOCAL_IP))) {
-//                    spUtil.putString(Constant.LOCAL_IP, "http://39.106.5.102:9081/");
-//                }
-//                retrofit = new Retrofit.Builder()
-//                        .client(builder.build())
-//                        .baseUrl(spUtil.getString(Constant.LOCAL_IP))
-//                        .addConverterFactory(GsonConverterFactory.create())
-//                        .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
-//                        .build();
-//            } else {
-//                retrofit = new Retrofit.Builder()
-//                        .client(builder.build())
-//                        .baseUrl(BuildConfig.MainIp)
-//                        .addConverterFactory(GsonConverterFactory.create())
-//                        .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
-//                        .build();
-//            }
+            if (BuildConfig.DEBUG) {
+                SPUtil spUtil = SPUtil.getInstance(context);
+                if (TextUtils.isEmpty(spUtil.getString(Constant.LOCAL_IP))) {
+                    spUtil.putString(Constant.LOCAL_IP, "http://39.106.5.102:9082/gs-api/");
+                }
+                retrofit = new Retrofit.Builder()
+                        .client(builder.build())
+                        .baseUrl(spUtil.getString(Constant.LOCAL_IP))
+                        .addConverterFactory(GsonConverterFactory.create())
+                        .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+                        .build();
+            } else {
+                retrofit = new Retrofit.Builder()
+                        .client(builder.build())
+                        .baseUrl(BuildConfig.MainIp)
+                        .addConverterFactory(GsonConverterFactory.create())
+                        .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+                        .build();
+            }
 
-            retrofit = new Retrofit.Builder()
-                    .client(builder.build())
-                    .baseUrl(BuildConfig.MainIp)
-                    .addConverterFactory(GsonConverterFactory.create())
-                    .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
-                    .build();
+//            retrofit = new Retrofit.Builder()
+//                    .client(builder.build())
+//                    .baseUrl(BuildConfig.MainIp)
+//                    .addConverterFactory(GsonConverterFactory.create())
+//                    .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+//                    .build();
 
 
             return retrofit.create(LoanService.class);

highgold/app/src/main/java/com/mints/highgold/ui/activitys/LoginActivity.java

@@ -144,7 +144,7 @@ public class LoginActivity extends BaseActivity implements LoginView {
         }else{
             llLoginAgreement.setVisibility(View.VISIBLE);
             btnLoginNext.setText("确定");
-            tvLoginTitle.setText("淘金空间账号注册/登录");
+            tvLoginTitle.setText("淘金空间高额版账号注册/登录");
         }
     }
 

highgold/app/src/main/java/com/mints/highgold/ui/activitys/RedboxActivity.java

@@ -8,6 +8,7 @@ import android.widget.TextView;
 
 import com.mints.highgold.R;
 import com.mints.highgold.common.Constant;
+import com.mints.highgold.mvp.model.EventMessage;
 import com.mints.highgold.mvp.model.RedBoxBean;
 import com.mints.highgold.mvp.model.RedBoxListBean;
 import com.mints.highgold.mvp.presenters.RedboxPresenter;
@@ -15,6 +16,7 @@ import com.mints.highgold.mvp.views.RedboxView;
 import com.mints.highgold.ui.activitys.base.BaseActivity;
 import com.mints.highgold.ui.widgets.countdowntimer.CountDownTimerSupport;
 import com.mints.highgold.ui.widgets.countdowntimer.OnCountDownTimerListener;
+import com.mints.highgold.utils.RxBus;
 import com.mints.highgold.utils.TimeRender;
 import com.mints.library.net.netstatus.NetUtils;
 import com.mints.library.utils.nodoubleclick.AntiShake;
@@ -24,6 +26,9 @@ import java.util.List;
 import butterknife.Bind;
 import butterknife.OnClick;
 
+import static com.mints.highgold.common.Constant.SHOW_THREE_FRAGMENT;
+import static com.mints.highgold.common.Constant.SHOW_TWO_FRAGMENT;
+
 /**
  * 描述：红包界面
  * 作者：孟崔广
@@ -226,10 +231,15 @@ public class RedboxActivity extends BaseActivity implements RedboxView {
                 gotoDialogActivity("8");
                 break;
             case R.id.rl_redbox_nine:
-                if (timerNine != null) {
-                    timerNine = null;
-                }
-                gotoDialogActivity("9");
+//                if (timerNine != null) {
+//                    timerNine = null;
+//                }
+//                gotoDialogActivity("9");
+
+                onDestoryTimer();
+                finish();
+                RxBus.getDefault().post(new EventMessage(SHOW_TWO_FRAGMENT));
+//                readyGo(FriendsNewActivity.class);
                 break;
             case R.id.rl_redbox_ten:
                 onDestoryTimer();

highgold/app/src/main/java/com/mints/highgold/ui/activitys/TryTaskDetailActivity.java

@@ -583,7 +583,7 @@ public class TryTaskDetailActivity extends BaseActivity implements TryTaskDetail
         int color = ContextCompat.getColor(getContext(), R.color.black);
         int red = ContextCompat.getColor(getContext(), R.color.red);
         list.add(new TimeLineBean("1、下载并安装", color));
-        list.add(new TimeLineBean("2、安装后返回“淘金空间”打开", red));
+        list.add(new TimeLineBean("2、安装后返回“淘金空间高额版”打开", red));
         list.add(new TimeLineBean("3、任务完成,获取" + coin + "金币", color));
         list.add(new TimeLineBean("4、返回上一级,继续赚金币", color));
         return list;

highgold/app/src/main/java/com/mints/highgold/ui/activitys/TryVedioActivity.java

@@ -747,14 +747,14 @@ public class TryVedioActivity extends BaseActivity implements TryVedioView {
             case Constant.CARRIER_ONLINE_INCOME_DOUBLE:// 在线收益翻倍
                 list.add(new TimeLineBean("1、看完视频，获得" + vedioCoin + "金币奖励", color));
                 list.add(new TimeLineBean("2、下载应用体验可能获得意外惊喜哦", color));
-                list.add(new TimeLineBean("3、安装后返回“淘金空间”", red));
+                list.add(new TimeLineBean("3、安装后返回“淘金空间高额版”", red));
                 list.add(new TimeLineBean("4、返回上一级，继续赚金币", color));
 //                llTryvedioDownload.setVisibility(View.GONE);
                 break;
             default:
                 list.add(new TimeLineBean("1、看完视频，得" + vedioCoin + "金币", color));
                 list.add(new TimeLineBean("2、下载应用，可额外获得" + vedioDownloadCoin + "金币", color));
-                list.add(new TimeLineBean("3、安装后返回“淘金空间”打开", red));
+                list.add(new TimeLineBean("3、安装后返回“淘金空间高额版”打开", red));
                 list.add(new TimeLineBean("4、返回上一级，继续赚金币", color));
                 break;
         }

highgold/app/src/main/java/com/mints/highgold/ui/fragment/MainFragment.java

@@ -496,32 +496,38 @@ public class MainFragment extends BaseFragment
 //                readyGo(TurntableActivity.class, bundle);
 //                break;
             case R.id.ll_fragment_main_game:// 游戏
-                if (userConfig.isAdFlag()) {
-                    new RxPermissions(getActivity())
-                            .request(Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_EXTERNAL_STORAGE)
-                            .subscribe(granted -> {
-                                if (granted) {
-//                                String gameId = "chengyudaguanren";
-                                    String gameId = userConfig.getGameHomeId();
-                                    if (!TextUtils.isEmpty(gameId) && liebaoManager.hasGame(gameId)) {
-                                        liebaoManager.startH5Game(gameId);
-                                    } else {
-                                        boolean main = getActivity() instanceof MainActivity;
-                                        if (main) {
-                                            MainActivity activity = (MainActivity) getActivity();
-                                            activity.clickTab3Layout();
-                                        }
-                                    }
-                                } else {
-                                    showMissingPermissionDialog("设备、储存");
-                                }
-                            });
-                } else {
-                    boolean main = getActivity() instanceof MainActivity;
-                    if (main) {
-                        MainActivity activity = (MainActivity) getActivity();
-                        activity.clickTab2Layout();
-                    }
+//                if (userConfig.isAdFlag()) {
+//                    new RxPermissions(getActivity())
+//                            .request(Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_EXTERNAL_STORAGE)
+//                            .subscribe(granted -> {
+//                                if (granted) {
+////                                String gameId = "chengyudaguanren";
+//                                    String gameId = userConfig.getGameHomeId();
+//                                    if (!TextUtils.isEmpty(gameId) && liebaoManager.hasGame(gameId)) {
+//                                        liebaoManager.startH5Game(gameId);
+//                                    } else {
+//                                        boolean main = getActivity() instanceof MainActivity;
+//                                        if (main) {
+//                                            MainActivity activity = (MainActivity) getActivity();
+//                                            activity.clickTab3Layout();
+//                                        }
+//                                    }
+//                                } else {
+//                                    showMissingPermissionDialog("设备、储存");
+//                                }
+//                            });
+//                } else {
+//                    boolean main = getActivity() instanceof MainActivity;
+//                    if (main) {
+//                        MainActivity activity = (MainActivity) getActivity();
+//                        activity.clickTab2Layout();
+//                    }
+//                }
+
+                boolean main = getActivity() instanceof MainActivity;
+                if (main) {
+                    MainActivity activity = (MainActivity) getActivity();
+                    activity.clickTab2Layout();
                 }
                 break;
             case R.id.ll_fragment_main_friend:// 邀请好友
@@ -529,7 +535,7 @@ public class MainFragment extends BaseFragment
 //                readyGo(FriendsActivity.class);
                 break;
             case R.id.iv_fragment_main_banner:
-                boolean main = getActivity() instanceof MainActivity;
+                main = getActivity() instanceof MainActivity;
                 if (main) {
                     MainActivity activity = (MainActivity) getActivity();
                     activity.clickTab2Layout();
@@ -1464,7 +1470,7 @@ public class MainFragment extends BaseFragment
 
         btnDialogBack.setOnClickListener(v -> {
             if (dialog != null && dialog.isShowing()) {
-                showToast("请您同意授权,否则将无法使用淘金空间APP功能");
+                showToast("请您同意授权,否则将无法使用淘金空间高额版APP功能");
             }
         });
 

highgold/app/src/main/java/com/mints/highgold/ui/fragment/MyFragment.java

@@ -31,6 +31,7 @@ import com.mints.highgold.ui.activitys.DrawcashActivity;
 import com.mints.highgold.ui.activitys.FeekbackActivity;
 import com.mints.highgold.ui.activitys.FriendsNewActivity;
 import com.mints.highgold.ui.activitys.GoldTryActivity;
+import com.mints.highgold.ui.activitys.MainActivity;
 import com.mints.highgold.ui.activitys.NewsWebviewActivity;
 import com.mints.highgold.ui.activitys.PhoneActivity;
 import com.mints.highgold.ui.activitys.RedboxActivity;
@@ -147,13 +148,13 @@ public class MyFragment extends BaseFragment
         super.onResume();
 
         //应用商店上线隐藏广告
-        if (userManager.getAdShowFlag()) {
-            if (ttUtil != null && flMyTtbanner != null) {
-                ttUtil.getBannerInit(getContext(), TTAdManagerHolder.TT_AD_BANNER_ID_MY, flMyTtbanner, 370, 80);
-            }
-        } else {
-            flMyTtbanner.setVisibility(View.GONE);
-        }
+//        if (userManager.getAdShowFlag()) {
+//            if (ttUtil != null && flMyTtbanner != null) {
+//                ttUtil.getBannerInit(getContext(), TTAdManagerHolder.TT_AD_BANNER_ID_MY, flMyTtbanner, 370, 80);
+//            }
+//        } else {
+//            flMyTtbanner.setVisibility(View.GONE);
+//        }
 
         if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_MY) {
             if (!TextUtils.isEmpty(userManager.getUserID())) {
@@ -269,26 +270,31 @@ public class MyFragment extends BaseFragment
                     // 自有界面
                     switch (hotTourl) {
                         case Constant.HOT_ACTIVITY_YWHZ:
-                            if (!userManager.userIsLogin()) {
-                                readyGo(WxLoginActivity.class);
-                                return;
+//                            if (!userManager.userIsLogin()) {
+//                                readyGo(WxLoginActivity.class);
+//                                return;
+//                            }
+//
+//                            new RxPermissions(getActivity())
+//                                    .request(Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_EXTERNAL_STORAGE)
+//                                    .subscribe(granted -> {
+//                                        if (granted) {
+//                                            try {
+//                                                YwSDK_WebActivity.Companion.open(getActivity());
+////                                                    toggleIsBack2Left();
+//                                            } catch (Exception e) {
+//                                                e.printStackTrace();
+//                                                showToast("暂不支持该版本");
+//                                            }
+//                                        } else {
+//                                            showMissingPermissionDialog("设备、储存");
+//                                        }
+//                                    });
+                            boolean main = getActivity() instanceof MainActivity;
+                            if (main) {
+                                MainActivity activity = (MainActivity) getActivity();
+                                activity.clickTab2Layout();
                             }
-
-                            new RxPermissions(getActivity())
-                                    .request(Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_EXTERNAL_STORAGE)
-                                    .subscribe(granted -> {
-                                        if (granted) {
-                                            try {
-                                                YwSDK_WebActivity.Companion.open(getActivity());
-//                                                    toggleIsBack2Left();
-                                            } catch (Exception e) {
-                                                e.printStackTrace();
-                                                showToast("暂不支持该版本");
-                                            }
-                                        } else {
-                                            showMissingPermissionDialog("设备、储存");
-                                        }
-                                    });
                             break;
                         case Constant.HOT_ACTIVITY_CHB:
                             readyGo(RedboxActivity.class);
@@ -342,35 +348,53 @@ public class MyFragment extends BaseFragment
 
     @Override
     public void getMyRotationChartSuc(BannerBean data) {
-        if (UserManager.getInstance().getAdShowFlag()) {
-            if (data != null && !data.isShow()) {
-                bvMyBanner.setVisibility(View.GONE);
-                return;
-            }
-            bvMyBanner.setVisibility(View.VISIBLE);
-            setBannerAdapter(data.getList());
-        } else {
+        if (data != null && !data.isShow()) {
             bvMyBanner.setVisibility(View.GONE);
+            return;
         }
+        bvMyBanner.setVisibility(View.VISIBLE);
+        setBannerAdapter(data.getList());
+
+//        if (UserManager.getInstance().getAdShowFlag()) {
+//            if (data != null && !data.isShow()) {
+//                bvMyBanner.setVisibility(View.GONE);
+//                return;
+//            }
+//            bvMyBanner.setVisibility(View.VISIBLE);
+//            setBannerAdapter(data.getList());
+//        } else {
+//            bvMyBanner.setVisibility(View.GONE);
+//        }
     }
 
     @Override
     public void getMyHotActivitySuc(BannerBean data) {
-        if (UserManager.getInstance().getAdShowFlag()) {
-            if (data != null && !data.isShow()) {
-                llMyHot.setVisibility(View.GONE);
-                return;
-            }
-            llMyHot.setVisibility(View.VISIBLE);
-            hotList = data.getList();
-            if (myAdapter != null) {
-                myAdapter = null;
-            }
-            myAdapter = new MyAdapter(getContext(), hotList);
-            gvMy.setAdapter(myAdapter);
-        } else {
+        if (data != null && !data.isShow()) {
             llMyHot.setVisibility(View.GONE);
+            return;
+        }
+        llMyHot.setVisibility(View.VISIBLE);
+        hotList = data.getList();
+        if (myAdapter != null) {
+            myAdapter = null;
         }
+        myAdapter = new MyAdapter(getContext(), hotList);
+        gvMy.setAdapter(myAdapter);
+//        if (UserManager.getInstance().getAdShowFlag()) {
+//            if (data != null && !data.isShow()) {
+//                llMyHot.setVisibility(View.GONE);
+//                return;
+//            }
+//            llMyHot.setVisibility(View.VISIBLE);
+//            hotList = data.getList();
+//            if (myAdapter != null) {
+//                myAdapter = null;
+//            }
+//            myAdapter = new MyAdapter(getContext(), hotList);
+//            gvMy.setAdapter(myAdapter);
+//        } else {
+//            llMyHot.setVisibility(View.GONE);
+//        }
     }
 
     private void setUserLoginStatus() {

highgold/app/src/main/java/com/mints/highgold/utils/AESUtils.java

@@ -15,7 +15,7 @@ import Decoder.BASE64Encoder;
 
 public class AESUtils {
 
-    private static final String vis = MD5.GetMD5Code("mints_2019").substring(8, 24);
+    private static final String vis = MD5.GetMD5Code("highgold_2020").substring(8, 24);
     //    public static final String key = "123456";
     public static String CIPHER_ALGORITHM = "AES/CBC/PKCS5Padding"; // optional value AES/DES/DESede
 

highgold/app/src/main/res/layout/activity_aboutas.xml

@@ -14,7 +14,7 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="60pt"
         android:layout_marginBottom="30pt"
-        android:text="淘金空间"
+        android:text="淘金空间高额版"
         android:textColor="@color/text_font"
         android:textSize="13sp" />
 

highgold/app/src/main/res/layout/activity_account.xml

@@ -99,6 +99,7 @@
     </LinearLayout>
 
     <LinearLayout
+        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="20pt"

highgold/app/src/main/res/layout/activity_drawcash.xml

@@ -110,6 +110,7 @@
                         android:src="@mipmap/ic_drawcash_wx_enable" />
 
                     <ImageView
+                        android:visibility="invisible"
                         android:id="@+id/iv_drawcash_alipay"
                         android:layout_width="0dp"
                         android:layout_height="136pt"
@@ -179,7 +180,7 @@
                         android:layout_weight="1"
                         android:background="@drawable/rb_index_checked"
                         android:gravity="center"
-                        android:text="提现1元"
+                        android:text="提现0.3元"
                         android:textColor="@drawable/rb_index_text_color"
                         android:textSize="16sp" />
 
@@ -191,7 +192,7 @@
                         android:layout_weight="1"
                         android:background="@drawable/rb_index_checked"
                         android:gravity="center"
-                        android:text="提现2元"
+                        android:text="提现100元"
                         android:textColor="@drawable/rb_index_text_color"
                         android:textSize="16sp" />
 
@@ -203,7 +204,7 @@
                         android:layout_weight="1"
                         android:background="@drawable/rb_index_checked"
                         android:gravity="center"
-                        android:text="提现5元"
+                        android:text="提现150元"
                         android:textColor="@drawable/rb_index_text_color"
                         android:textSize="16sp" />
 
@@ -224,7 +225,7 @@
                         android:layout_weight="1"
                         android:background="@drawable/rb_index_checked"
                         android:gravity="center"
-                        android:text="提现10元"
+                        android:text="提现200元"
                         android:textColor="@drawable/rb_index_text_color"
                         android:textSize="16sp" />
 
@@ -236,11 +237,12 @@
                         android:layout_weight="1"
                         android:background="@drawable/rb_index_checked"
                         android:gravity="center"
-                        android:text="提现30元"
+                        android:text="提现500元"
                         android:textColor="@drawable/rb_index_text_color"
                         android:textSize="16sp" />
 
                     <Button
+                        android:visibility="invisible"
                         android:id="@+id/btn_drawcash_six"
                         android:layout_width="0dp"
                         android:layout_height="160pt"
@@ -254,41 +256,6 @@
 
                 </LinearLayout>
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="50pt"
-                    android:layout_marginTop="10pt"
-                    android:layout_marginRight="50pt"
-                    android:orientation="horizontal">
-
-                    <Button
-                        android:id="@+id/btn_drawcash_seven"
-                        android:layout_width="0dp"
-                        android:layout_height="160pt"
-                        android:layout_marginBottom="20pt"
-                        android:layout_weight="1"
-                        android:background="@drawable/rb_index_checked"
-                        android:gravity="center"
-                        android:text="提现100元"
-                        android:textColor="@drawable/rb_index_text_color"
-                        android:textSize="16sp" />
-
-                    <Button
-                        android:layout_width="0dp"
-                        android:layout_height="150pt"
-                        android:layout_marginLeft="16pt"
-                        android:layout_weight="1"
-                        android:visibility="invisible" />
-
-                    <Button
-                        android:layout_width="0dp"
-                        android:layout_height="150pt"
-                        android:layout_marginLeft="16pt"
-                        android:layout_weight="1"
-                        android:visibility="invisible" />
-
-                </LinearLayout>
 
                 <TextView
                     android:id="@+id/tv_drawcash_wxnotify"
@@ -356,7 +323,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="30pt"
-                android:text="所需金币:10000"
+                android:text="所需金币:3000"
                 android:textColor="@color/black_text"
                 android:textSize="14sp" />
 

highgold/app/src/main/res/layout/activity_friends2.xml

@@ -109,7 +109,7 @@
             android:background="@color/white"
             android:gravity="center_vertical"
             android:padding="40pt"
-            android:text="淘金空间APP,每天点一点就能赚钱的APP，支付宝秒提现。分享链接开始注册(目前仅限Android手机)"
+            android:text="淘金空间高额版APP,每天点一点就能赚钱的APP，支付宝秒提现。分享链接开始注册(目前仅限Android手机)"
             android:textSize="14sp" />
     </LinearLayout>
 

highgold/app/src/main/res/layout/activity_login.xml

@@ -15,7 +15,7 @@
         android:layout_marginLeft="30pt"
         android:layout_marginTop="40pt"
         android:layout_marginBottom="40pt"
-        android:text="淘金空间账号注册/登录"
+        android:text="淘金空间高额版账号注册/登录"
         android:textColor="@color/product_text"
         android:textSize="18sp"
         android:textStyle="bold" />
@@ -145,7 +145,7 @@
             android:layout_height="wrap_content"
             android:paddingTop="10pt"
             android:paddingBottom="6dp"
-            android:text="点击确定即代表同意淘金空间"
+            android:text="点击确定即代表同意淘金空间高额版"
             android:textColor="@color/product_hint_text"
             android:textSize="12sp" />
 

highgold/app/src/main/res/layout/activity_wx_login.xml

@@ -70,7 +70,7 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="10pt"
                 android:paddingBottom="6dp"
-                android:text="点击登录即代表同意淘金空间"
+                android:text="点击登录即代表同意淘金空间高额版"
                 android:textColor="@color/product_hint_text"
                 android:textSize="12sp" />
 

highgold/app/src/main/res/layout/item_list_game.xml

@@ -34,7 +34,7 @@
                 android:id="@+id/tv_main_item_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="淘金空间"
+                android:text="淘金空间高额版"
                 android:textColor="@color/product_net_text"
                 android:textSize="14sp"
                 android:textStyle="bold" />

highgold/app/src/main/res/layout/item_list_registmoney.xml

@@ -24,7 +24,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16pt"
-            android:text="淘金空间"
+            android:text="淘金空间高额版"
             android:textColor="@color/product_net_text"
             android:textSize="14sp" />
 

highgold/app/src/main/res/layout/item_list_trymoney.xml

@@ -25,7 +25,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16pt"
-            android:text="淘金空间"
+            android:text="淘金空间高额版"
             android:textColor="@color/product_net_text"
             android:textSize="14sp" />
 

highgold/app/src/main/res/layout/item_list_trytask.xml

@@ -24,7 +24,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
-            android:text="淘金空间"
+            android:text="淘金空间高额版"
             android:textColor="@color/product_net_text"
             android:textSize="14sp" />
 

highgold/app/src/main/res/layout/item_phone_number.xml

@@ -6,6 +6,7 @@
 
 
     <RelativeLayout
+        android:visibility="gone"
         android:id="@+id/rl_phone_number_qq"
         android:layout_width="match_parent"
         android:layout_height="96pt"
@@ -52,6 +53,7 @@
     </RelativeLayout>
 
     <RelativeLayout
+
         android:id="@+id/rl_phone_number_qqperson"
         android:layout_width="match_parent"
         android:layout_height="96pt"

highgold/app/src/main/res/layout/view_dialog_permission.xml

@@ -4,7 +4,7 @@
     android:layout_height="match_parent">
 
     <LinearLayout
-        android:layout_width="600pt"
+        android:layout_width="400dp"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:background="@drawable/shape_bg_write"
@@ -14,7 +14,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="40pt"
+            android:layout_marginTop="20dp"
             android:text="用户协议及隐私条款"
             android:textColor="@color/black"
             android:textSize="18sp"
@@ -23,18 +23,18 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="30pt"
-            android:layout_marginTop="30pt"
-            android:layout_marginRight="30pt"
-            android:text="我们依据最新的法律,向您说明淘金空间软件的隐私政策,特向您推送本提示。请您阅读并充分理解相关条款。"
+            android:layout_marginLeft="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginRight="16dp"
+            android:text="我们依据最新的法律,向您说明淘金空间高额版软件的隐私政策,特向您推送本提示。请您阅读并充分理解相关条款。"
             android:textColor="@color/black"
             android:textSize="14sp" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="30pt"
-            android:layout_marginTop="30pt"
+            android:layout_marginLeft="16dp"
+            android:layout_marginTop="16dp"
             android:text="我们承诺"
             android:textColor="@color/black"
             android:textSize="16sp"
@@ -43,14 +43,14 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="36pt"
-            android:layout_marginTop="30pt"
-            android:layout_marginRight="30pt"
+            android:layout_marginLeft="18dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginRight="16dp"
             android:orientation="horizontal">
 
             <ImageView
-                android:layout_width="80pt"
-                android:layout_height="80pt"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
                 android:layout_gravity="center_vertical"
                 android:src="@mipmap/ic_dialog_permission_top" />
 
@@ -58,7 +58,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginLeft="10pt"
+                android:layout_marginLeft="4dp"
                 android:text="我们会严格按照《网络安全法》、《信息网络传播保护条例》等保护您的个人信息"
                 android:textColor="@color/ban_transparent"
                 android:textSize="14sp" />
@@ -67,14 +67,14 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="36pt"
-            android:layout_marginTop="30pt"
-            android:layout_marginRight="30pt"
+            android:layout_marginLeft="18dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginRight="16dp"
             android:orientation="horizontal">
 
             <ImageView
-                android:layout_width="80pt"
-                android:layout_height="80pt"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
                 android:layout_gravity="center_vertical"
                 android:src="@mipmap/ic_dialog_permission_bottom" />
 
@@ -82,7 +82,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginLeft="10pt"
+                android:layout_marginLeft="4dp"
                 android:text="如果未经您的授权，我们不会使用您的个人信息用于您未授权的其他途径和目的"
                 android:textColor="@color/ban_transparent"
                 android:textSize="14sp" />
@@ -91,9 +91,9 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="30pt"
-            android:layout_marginTop="30pt"
-            android:layout_marginRight="30pt"
+            android:layout_marginLeft="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginRight="16dp"
             android:gravity="center_horizontal"
             android:text="您点击“同意”，即表示您已阅读并同意更新后的《服务协议》及《隐私政策》"
             android:textColor="@color/black"
@@ -109,7 +109,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingTop="10pt"
+                android:paddingTop="4dp"
                 android:paddingBottom="6dp"
                 android:text="查看完整版"
                 android:textColor="@color/ban_transparent"
@@ -119,9 +119,9 @@
                 android:id="@+id/tv_dialogper_agreement"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingLeft="8pt"
-                android:paddingTop="10pt"
-                android:paddingRight="4pt"
+                android:paddingLeft="4dp"
+                android:paddingTop="6dp"
+                android:paddingRight="2dp"
                 android:paddingBottom="6dp"
                 android:text="用户协议"
                 android:textColor="@color/main"
@@ -130,7 +130,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingTop="10pt"
+                android:paddingTop="6dp"
                 android:paddingBottom="6dp"
                 android:text="及"
                 android:textColor="@color/ban_transparent"
@@ -140,9 +140,9 @@
                 android:id="@+id/tv_dialogper_policy"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingLeft="4pt"
-                android:paddingTop="10pt"
-                android:paddingRight="4pt"
+                android:paddingLeft="2dp"
+                android:paddingTop="6dp"
+                android:paddingRight="2dp"
                 android:paddingBottom="6dp"
                 android:text="用户隐私声明"
                 android:textColor="@color/main"
@@ -153,8 +153,8 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1px"
-            android:layout_marginTop="10pt"
-            android:layout_marginBottom="20pt"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="10dp"
             android:background="#E1E1E1" />
 
         <LinearLayout
@@ -165,12 +165,12 @@
             <Button
                 android:id="@+id/btn_dialogper_back"
                 android:layout_width="0dp"
-                android:layout_height="66pt"
+                android:layout_height="36dp"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginLeft="40pt"
-                android:layout_marginTop="20pt"
-                android:layout_marginRight="40pt"
-                android:layout_marginBottom="20pt"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginBottom="10dp"
                 android:layout_weight="1"
                 android:background="@color/grayc"
                 android:text="不同意"
@@ -179,12 +179,12 @@
             <Button
                 android:id="@+id/btn_dialogper_next"
                 android:layout_width="0dp"
-                android:layout_height="66pt"
+                android:layout_height="36dp"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginLeft="40pt"
-                android:layout_marginTop="20pt"
-                android:layout_marginRight="40pt"
-                android:layout_marginBottom="20pt"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginBottom="10dp"
                 android:layout_weight="1"
                 android:background="@color/main_color"
                 android:text="同意"

highgold/app/src/main/res/layout/view_dialog_update.xml

@@ -9,8 +9,8 @@
         android:orientation="vertical">
 
         <LinearLayout
-            android:layout_width="691pt"
-            android:layout_height="552pt"
+            android:layout_width="340dp"
+            android:layout_height="300dp"
             android:layout_gravity="center_horizontal"
             android:layout_margin="20dp"
             android:background="@drawable/shape_dialog_bg"
@@ -22,8 +22,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="30pt"
-                android:layout_marginTop="30pt"
+                android:layout_marginBottom="18dp"
+                android:layout_marginTop="18dp"
                 android:text="更新提示"
                 android:textColor="@color/black_text"
                 android:textSize="14sp" />
@@ -37,18 +37,18 @@
                 layout="@layout/progress_horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="3dp"
-                android:layout_marginLeft="1pt"/>
+                android:layout_marginLeft="1dp"/>
 
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="30pt">
+                android:layout_marginBottom="18dp">
 
                 <TextView
                     android:id="@+id/tv_du_dialogdetails"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_margin="4pt"
+                    android:layout_margin="2dp"
                     android:lineSpacingExtra="10dp"
                     android:maxLines="6"
                     android:padding="5dp"
@@ -59,8 +59,8 @@
 
                 <Button
                     android:id="@+id/btn_du_update"
-                    android:layout_width="250pt"
-                    android:layout_height="66pt"
+                    android:layout_width="180dp"
+                    android:layout_height="40dp"
                     android:layout_alignParentBottom="true"
                     android:layout_centerHorizontal="true"
                     android:background="@drawable/btn_user_loginselecter"

highgold/app/src/main/res/values/strings.xml

 <resources>
-    <string name="app_name">淘金空间</string>
+    <string name="app_name">淘金空间高额版</string>
 
     <string name="netfail">网络异常，请检查网络</string>
     <string name="notifyTitle">提示</string>

highgold/shareSdkLib/src/main/assets/ShareSDK.xml

@@ -77,12 +77,12 @@
         但是只能分享图片和文字，username和path是分享小程序用的的，userName是小程序的原始ID，path是小程序内的页面路径；
         而且必须保证微信开放平台与微信公众/小程序绑定才可以分享；不需要的不用管
     -->
-    <Wechat AppId="wx8db5a20e0d22922e" AppSecret="a211a60f27497f1698da638faa63941c" BypassApproval="false"
+    <Wechat AppId="wxd7d8aa2eab869247" AppSecret="1b944cff68a33c43bc4393f210211069" BypassApproval="false"
         Enable="true" Id="4"
         MiniprogramType="0" Path="pages/index/index.html?id=1" SortId="4"
         UserName="gh_afb25ac019c9" WithShareTicket="true" />
 
-    <WechatMoments AppId="wx8db5a20e0d22922e" AppSecret="a211a60f27497f1698da638faa63941c" BypassApproval="false"
+    <WechatMoments AppId="wxd7d8aa2eab869247" AppSecret="1b944cff68a33c43bc4393f210211069" BypassApproval="false"
         Enable="true" Id="5" SortId="5" />
 
     <WechatFavorite AppId="wx4868b35061f87885" AppSecret="64020361b8ec4c99936c0e3999a9f249" Enable="true"
@@ -90,7 +90,7 @@
 
     <!-- ShareByAppClient标识是否使用微博客户端分享，默认是false -->
 
-    <QQ AppId="1109991028" AppKey="RQD3TKgd1FpMTMYY" BypassApproval="false" Enable="true" Id="7"
+    <QQ AppId="1110408544" AppKey="8ol8BdoLoLxZfRFx" BypassApproval="false" Enable="true" Id="7"
         ShareByAppClient="true" SortId="7" />