Merge remote-tracking branch 'origin/master'

app/src/main/java/com/zhangxin/magicbox/activity/MainActivity.java

@@ -13,6 +13,7 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 
+import com.mob.MobSDK;
 import com.umeng.socialize.UMShareAPI;
 import com.zhangxin.magicbox.R;
 import com.umeng.analytics.MobclickAgent;
@@ -41,8 +42,14 @@ import com.zxhl.main.page.view.NavigationBottomView;
 import com.zxhl.uc.page.fragment.UserCenterFragment;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
+import cn.sharesdk.facebook.Facebook;
+import cn.sharesdk.framework.Platform;
+import cn.sharesdk.framework.PlatformActionListener;
+import cn.sharesdk.framework.ShareSDK;
+import cn.sharesdk.google.GooglePlus;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.functions.Consumer;
@@ -94,6 +101,7 @@ public class MainActivity extends BaseActivity implements NavigationBottomView.N
         initListener();
         AdDataSupport.INSTANCE.init(this);
         initFragment();
+//        facelogin();
         mRestartLoginObservable = RxBus.get().register(Constant.REFRESH_LOGIN_STATS, String.class);
         mRestartLoginObservable.observeOn(AndroidSchedulers.mainThread()).subscribe(new Consumer<String>() {
             @Override
@@ -342,7 +350,7 @@ public class MainActivity extends BaseActivity implements NavigationBottomView.N
         super.onActivityResult(requestCode, resultCode, data);
         try {
             UMShareAPI.get(this).onActivityResult(requestCode, resultCode, data);
-        } catch ( Exception e) {
+        } catch (Exception e) {
         }
     }
     //    @Override
@@ -368,4 +376,25 @@ public class MainActivity extends BaseActivity implements NavigationBottomView.N
     protected void onSaveInstanceState(@NonNull Bundle outState) {
 //        super.onSaveInstanceState(outState);
     }
+
+    private void facelogin() {
+        MobSDK.submitPolicyGrantResult(true,null);
+        Platform plat = ShareSDK.getPlatform(Facebook.NAME);
+//授权回调监听，监听oncomplete，onerror，oncancel三种状态
+        plat.setPlatformActionListener(new PlatformActionListener() {
+            public void onError(Platform arg0, int arg1, Throwable arg2) {
+                //失败的回调，arg:平台对象，arg1:表示当前的动作(8:有用户信息登录, 1:无用户信息登录)，arg2:异常信息
+            }
+
+            public void onComplete(Platform arg0, int arg1, HashMap arg2) {
+                //分享成功的回调
+            }
+
+            public void onCancel(Platform arg0, int arg1) {
+                //取消分享的回调
+            }
+        });
+//ShareSDK.setActivity(this);//抖音登录适配安卓9.0
+        plat.authorize();
+    }
 }

build.gradle

@@ -3,6 +3,9 @@
 buildscript {
     ext.kotlin_version =  '1.4.21'
     repositories {
+        maven {
+            url "https://mvn.mob.com/android"
+        }
         google()
         jcenter()
     }

cms/build.gradle

 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-
+apply plugin: 'com.mob.sdk'
 apply plugin: 'kotlin-android-extensions'
 
 android {
@@ -32,6 +32,40 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    MobSDK {
+        appKey "357874b62b4c7"
+        appSecret "c4d82ff12e0cde832960ddbb8d2d7250"
+        ShareSDK {
+            loopShare true
+            devInfo {
+                Facebook {
+                    id 8
+                    sortId 8
+                    appKey "1412473428822331"
+                    appSecret "a42f4f3f867dc947b9ed6020c2e93558"
+                    callbackUri "https://www.baidu.com"
+                    officialVersion "default"
+                    faceBookLoginProtocolScheme "fb1412473428822331"
+                    shareByAppClient true
+                    enable true
+                }
+                GooglePlus {
+                    id 21
+                    sortId 21
+                    appId "236300675100-am5pm8km7md1memjevq8rl9pg5c4s4b8.apps.googleusercontent.com"
+                    callbackUri "http://localhost"
+                    officialVersion "default"
+                    shareByAppClient true
+                    enable true
+                }
+
+            }
+        }
+    }
+
+
+
     sourceSets {
         main {
             jniLibs.srcDirs = ['libs']

cms/src/main/java/com/zxhl/cms/utils/WeChatUtils.kt

@@ -4,6 +4,12 @@ import android.app.Activity
 import android.content.Context
 import android.util.Log
 import android.widget.Toast
+import cn.sharesdk.facebook.Facebook
+import cn.sharesdk.framework.Platform
+import cn.sharesdk.framework.PlatformActionListener
+import cn.sharesdk.framework.ShareSDK
+import cn.sharesdk.google.GooglePlus
+import com.mob.MobSDK
 import com.umeng.socialize.UMAuthListener
 import com.umeng.socialize.UMShareAPI
 import com.umeng.socialize.UMShareListener
@@ -15,7 +21,7 @@ import com.zxhl.cms.net.SettingPreference
 import com.zxhl.cms.net.callback.BaseObserver
 import com.zxhl.cms.net.model.other.IsWeChatLoginEntity
 import com.zxhl.cms.net.model.other.WxBindEntity
-import okhttp3.internal.platform.Platform
+import java.util.*
 
 
 class WeChatUtils {
@@ -23,7 +29,8 @@ class WeChatUtils {
 
     private var isLogin: Boolean? = false
     private var mContext: Context? = null
-    private var lottery:String?=""
+    private var lottery: String? = ""
+
     constructor(context: Context, mCallBack: WeChatLoginSuccessCallBall) : super() {
         mContext = context
         this.callBack = mCallBack
@@ -50,7 +57,7 @@ class WeChatUtils {
 
     fun wechatLogin(activity: Activity, str: String) {
         Log.e("MXL", "微信登录")
-        lottery=str
+        lottery = str
 
         UMShareAPI.get(activity)
             .getPlatformInfo(activity, SHARE_MEDIA.WEIXIN, object :
@@ -182,4 +189,43 @@ class WeChatUtils {
                 Utils.showToast(AppContext.get(), "分享取消")
             }
         }
+
+    fun FackBooklogin() {
+        MobSDK.submitPolicyGrantResult(true, null)
+        val plat = ShareSDK.getPlatform(Facebook.NAME)
+//授权回调监听，监听oncomplete，onerror，oncancel三种状态
+        plat.platformActionListener = object : PlatformActionListener {
+            override fun onComplete(p0: Platform?, p1: Int, p2: HashMap<String, Any>?) {
+
+            }
+
+            override fun onError(arg0: Platform, arg1: Int, arg2: Throwable) {
+                //失败的回调，arg:平台对象，arg1:表示当前的动作(8:有用户信息登录, 1:无用户信息登录)，arg2:异常信息
+            }
+
+            override fun onCancel(arg0: Platform, arg1: Int) {
+                //取消分享的回调
+            }
+        }
+        plat.authorize()
+    }
+    fun GoogleLogin(){
+        MobSDK.submitPolicyGrantResult(true, null)
+        val plat = ShareSDK.getPlatform(GooglePlus.NAME)
+//授权回调监听，监听oncomplete，onerror，oncancel三种状态
+        plat.platformActionListener = object : PlatformActionListener {
+            override fun onComplete(p0: Platform?, p1: Int, p2: HashMap<String, Any>?) {
+
+            }
+            override fun onError(arg0: Platform, arg1: Int, arg2: Throwable) {
+                //失败的回调，arg:平台对象，arg1:表示当前的动作(8:有用户信息登录, 1:无用户信息登录)，arg2:异常信息
+            }
+
+            override fun onCancel(arg0: Platform, arg1: Int) {
+                //取消分享的回调
+            }
+        }
+        plat.authorize()
+    }
+
 }
\ No newline at end of file

cms/src/main/res/values/strings.xml

@@ -42,8 +42,17 @@
     <string name="recycle_desc2">You can exchange high-value goods</string>
     <!--订单-->
     <string name="shop_order">商城订单</string>
-    <string name="my_order">我的订单</string>
+    <string name="my_order">My order</string>
     <string name="magic_box_order">魔盒订单</string>
+    <!--下单成功-->
+    <string name="order_suceess_title">Deliver</string>
+    <string name="delivery_request_succes">Delivery request successful</string>
+    <string name="check_my_order">Check my order</string>
+    <!--我的-->
+    <string name="delivery_address">Delivery address</string>
+    <string name="customerservice">Customer service</string>
+    <string name="about_us">About us</string>
+    <string name="suggested">Suggested</string>
     <!--底部-->
     <string name="shop">Mall</string>
     <string name="box">Boxes</string>

moduleMain/src/main/java/com/zxhl/main/page/activity/LoginActivity.kt

@@ -21,6 +21,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import kotlinx.android.synthetic.main.activity_login.*
 import java.util.concurrent.TimeUnit
 
+
 /**
  * Created by gaoleichao on 2018/12/28
  */
@@ -79,7 +80,7 @@ class LoginActivity : WxImpl(), LoginContract.View {
                 }
                 if (p0?.length == 11) {
                     id_activity_login_edit_phone_getcode?.setTextColor(getResources().getColor(R.color.color_3A95FD))
-                }else{
+                } else {
                     id_activity_login_edit_phone_getcode?.setTextColor(getResources().getColor(R.color.color_bbbbbb))
                 }
             }
@@ -282,11 +283,13 @@ class LoginActivity : WxImpl(), LoginContract.View {
                 InputType.TYPE_TEXT_VARIATION_PASSWORD or InputType.TYPE_CLASS_TEXT// 设置文本类密码（默认不可见），这两个属性必须同时设置
         }
     }
+
     private var mPrepareExit = false
     override fun onBackPressed() {
 //        super.onBackPressed();
         exitBy2Click()
     }
+
     private fun exitBy2Click() {
         if (!mPrepareExit) {
             mPrepareExit = true // 准备退出

moduleMain/src/main/java/com/zxhl/main/page/activity/OrderSuccessActivity.kt

@@ -15,7 +15,7 @@ class OrderSuccessActivity : BaseActivity() {
     }
     override fun before() {
         super.before()
-        setStatusBarBackground(AppContext.get().resources.getColor(R.color.transparent))
+        setStatusBarBackground(AppContext.get().resources.getColor(R.color.white))
     }
     override fun layoutID(): Int {
         return R.layout.activity_layout_order_success

moduleMain/src/main/res/layout/activity_layout_order_success.xml

@@ -25,7 +25,7 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:includeFontPadding="false"
-            android:text="商品详情"
+            android:text="@string/order_suceess_title"
             android:textSize="18sp"
             android:textColor="@color/color_333333"
             android:textStyle="bold" />
@@ -46,7 +46,7 @@
         android:layout_marginTop="10dp"
         android:drawableRight="@drawable/icon_order_chenggong2"
         android:drawablePadding="5dp"
-        android:text="支付成功"
+        android:text="@string/delivery_request_succes"
         android:textColor="@color/color_333333"
         android:textSize="18sp"
         android:textStyle="bold" />
@@ -59,7 +59,7 @@
         android:visibility="visible"
         android:background="@drawable/shape_ff2e31_r25"
         android:gravity="center"
-        android:text="查看订单"
+        android:text="@string/check_my_order"
         android:textColor="@color/white"
         android:textSize="18sp"
         android:textStyle="bold" />

moduleMain/src/main/res/layout/item_layout_magic_coin.xml

@@ -32,8 +32,6 @@
                 android:layout_weight="1"
                 android:ellipsize="end"
                 android:lines="2"
-                android:text="回收｜苹果12手机回收苹果
-苹果12手机苹果苹果12手…"
                 android:textColor="@color/color_333333"
                 android:textSize="14sp" />
 
@@ -44,8 +42,7 @@
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="15dp"
                 android:layout_toRightOf="@+id/id_tv_goods_name"
-                android:text="+1999"
-                android:textColor="#FF2E31"
+                android:textColor="@color/color_4c84ff"
                 android:textSize="14sp" />
         </LinearLayout>
 
@@ -60,7 +57,6 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="2020-11-23 11:11"
                 android:textColor="@color/color_999999"
                 android:textSize="12sp" />
 
@@ -69,7 +65,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="15dp"
-                android:text="余额:299魔币"
                 android:textColor="@color/color_666666"
                 android:textSize="12sp" />
 

moduleUc/src/main/java/com/zxhl/uc/page/fragment/UserCenterFragment.kt

@@ -9,6 +9,7 @@ import com.bumptech.glide.load.resource.bitmap.CircleCrop
 import com.bumptech.glide.request.RequestOptions
 import com.bytedance.sdk.openadsdk.TTAdNative
 import com.bytedance.sdk.openadsdk.TTNativeExpressAd
+import com.zxhl.cms.AppContext
 import com.zxhl.cms.ad.upload.Utils.AdUpload
 import com.zxhl.cms.ad.upload.model.NewsEntity
 import com.zxhl.cms.common.NetConfig
@@ -46,13 +47,13 @@ class UserCenterFragment : BaseFragment(), AdCallback<String> {
             JumpUtils.LogisticsJump()
         }
         id_rl_jiyijan?.setOnClickListener {
-            JumpUtils.webJump("联系客服", NetConfig.H5.WEB_URL_CUSTOMER_SERVICE)
+            JumpUtils.webJump(mActivity.getString(R.string.customer_service), NetConfig.H5.WEB_URL_CUSTOMER_SERVICE)
         }
         id_rl_lianxikefu?.setOnClickListener {
-            JumpUtils.webJump("联系客服", NetConfig.H5.WEB_URL_CUSTOMER_SERVICE)
+            JumpUtils.webJump(mActivity.getString(R.string.customerservice), NetConfig.H5.WEB_URL_CUSTOMER_SERVICE)
         }
         id_rl_about_us?.setOnClickListener {
-            JumpUtils.webJump("关于我们", NetConfig.H5.WEB_URL_ABOUT_US)
+            JumpUtils.webJump(mActivity.getString(R.string.about_us), NetConfig.H5.WEB_URL_ABOUT_US)
         }
 ////        id_fragment_user_member_btn?.setOnClickListener {
 ////            JumpUtils.memberJump()

moduleUc/src/main/res/layout/layout_recommend.xml

@@ -24,86 +24,87 @@
 
             <TextView
                 android:id="@+id/id_rl_my_order"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:drawableTop="@drawable/icon_dingdan"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="我的订单"
+                android:text="@string/my_order"
                 android:textColor="@color/color_333333"
                 android:textSize="15sp" />
 
             <TextView
                 android:id="@+id/id_rl_address"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:drawableTop="@drawable/icon_shouhuo"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="收货地址"
+                android:text="@string/delivery_address"
                 android:textColor="@color/color_333333"
                 android:textSize="15sp" />
-
-
             <TextView
-                android:id="@+id/id_rl_logistics"
-                android:layout_width="wrap_content"
+                android:id="@+id/id_rl_jiyijan"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:drawableTop="@drawable/icon_wuliuwenti"
+                android:drawableTop="@drawable/icon_kefu"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="物流问题"
+                android:text="@string/customerservice"
                 android:textColor="@color/color_333333"
                 android:textSize="15sp" />
 
 
             <TextView
-                android:id="@+id/id_rl_lianxikefu"
-                android:layout_width="wrap_content"
+                android:id="@+id/id_rl_about_us"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:drawableTop="@drawable/icon_yijian"
+                android:drawableTop="@drawable/icon_guanyu"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="意见反馈"
+                android:text="@string/about_us"
                 android:textColor="@color/color_333333"
                 android:textSize="15sp" />
 
+
+
+
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="15dp">
+            android:layout_marginTop="15dp"
+            android:visibility="gone">
 
             <TextView
-                android:id="@+id/id_rl_jiyijan"
+                android:id="@+id/id_rl_logistics"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:drawableTop="@drawable/icon_kefu"
+                android:drawableTop="@drawable/icon_wuliuwenti"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="联系客服"
+                android:text="物流问题"
                 android:textColor="@color/color_333333"
                 android:textSize="15sp" />
 
 
             <TextView
-                android:id="@+id/id_rl_about_us"
+                android:id="@+id/id_rl_lianxikefu"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:drawableTop="@drawable/icon_guanyu"
+                android:drawableTop="@drawable/icon_yijian"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="关于我们"
+                android:text="意见反馈"
                 android:textColor="@color/color_333333"
                 android:textSize="15sp" />
-
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -147,7 +148,7 @@
             android:layout_marginLeft="10dp"
             android:layout_marginTop="10dp"
             android:layout_marginBottom="5dp"
-            android:text="推荐盲盒"
+            android:text="@string/suggested"
             android:textColor="@color/color_333333"
             android:textStyle="bold"
             android:textSize="16sp" />
@@ -163,7 +164,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="到我的底线咯～"
+        android:text="@string/box_detail_open_box_bottom_desc"
         android:layout_gravity="center"
         android:layout_marginTop="10dp"
         android:layout_marginBottom="20dp"/>