Merge remote-tracking branch 'origin/master'

# Conflicts:
#	moduleMain/src/main/java/com/zxhl/main/page/adapter/ItemGoodsAdapter.kt
#	moduleMain/src/main/res/layout/items_layout_box_order.xml

app/build.gradle

@@ -66,25 +66,25 @@ android {
     MobSDK {
         appKey "357874b62b4c7"
         appSecret "c4d82ff12e0cde832960ddbb8d2d7250"
+        gui false
+        version '3.9.7'
         ShareSDK {
             loopShare true
             devInfo {
                 Facebook {
                     id 8
                     sortId 8
-                    appKey "305929098113554"
-                    appSecret "a42f4f3f867dc947b9ed6020c2e93558"
+                    appKey "662970168312513"
                     callbackUri "https://www.baidu.com"
                     officialVersion "default"
                     faceBookLoginProtocolScheme "fb662970168312513"
                     shareByAppClient true
                     enable true
                 }
-
                 GooglePlus {
                     id 21
                     sortId 21
-                    appId "535211515800-9b6op28etopmltck4s09420h8shbr1cf.apps.googleusercontent.com"
+                    appId "236300675100-am5pm8km7md1memjevq8rl9pg5c4s4b8.apps.googleusercontent.com"
                     callbackUri "http://localhost"
                     officialVersion "default"
                     shareByAppClient true

app/src/main/java/com/zhangxin/magicbox/Appli.kt

@@ -39,6 +39,8 @@ class Appli : Application() {
         Config.init(this)
         getOaid()
         initByteDance()
+         MobSDK.init(this)
+        MobSDK.submitPolicyGrantResult(true, null)
         MobSDK.init(this)
         initPayPal()
     }

cms/build.gradle

@@ -36,17 +36,18 @@ android {
     MobSDK {
         appKey "357874b62b4c7"
         appSecret "c4d82ff12e0cde832960ddbb8d2d7250"
+        gui false
+        version '3.9.7'
         ShareSDK {
             loopShare true
             devInfo {
                 Facebook {
                     id 8
                     sortId 8
-                    appKey "1412473428822331"
-                    appSecret "a42f4f3f867dc947b9ed6020c2e93558"
+                    appKey "662970168312513"
                     callbackUri "https://www.baidu.com"
                     officialVersion "default"
-                    faceBookLoginProtocolScheme "fb1412473428822331"
+                    faceBookLoginProtocolScheme "fb662970168312513"
                     shareByAppClient true
                     enable true
                 }

cms/src/main/java/com/zxhl/cms/common/NetConfig.java

@@ -143,6 +143,7 @@ public class NetConfig {
         public static final String USER_SEND_CODE = "app/v1/auth/sendCode";//发送验证码
         public static final String USER_PHONE_CODE_LOGIN = "app/v3/auth/phoneCodeLogin";//验证码登录
         public static final String URL_VERSION = "app/v1/version";
+        public static final String URL_AUTH_GOOGLE_LOGIN = "app/v1/auth/googleLogin";//绑定谷歌登录
     }
 
     public static class Task {

cms/src/main/java/com/zxhl/cms/net/api/IHomeApi.kt

@@ -231,4 +231,11 @@ interface IHomeApi {
 
     @GET(NetConfig.Box.HOME_BOX_NOTICE)
     fun getNotice(): Observable<Response<NoticeEntity?>>
+
+    @POST(NetConfig.User.URL_AUTH_GOOGLE_LOGIN)
+    fun authGoogleLogin(
+        @Query("userID") userID: String?,
+        @Query("nickname") nickname: String?,
+        @Query("picture") picture: String?
+    ): Observable<Response<WxBindEntity?>>
 }
\ No newline at end of file

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

@@ -9,6 +9,8 @@ import cn.sharesdk.framework.Platform
 import cn.sharesdk.framework.PlatformActionListener
 import cn.sharesdk.framework.ShareSDK
 import cn.sharesdk.google.GooglePlus
+import com.google.gson.Gson
+import com.google.gson.JsonObject
 import com.mob.MobSDK
 import com.umeng.socialize.UMAuthListener
 import com.umeng.socialize.UMShareAPI
@@ -191,7 +193,6 @@ class WeChatUtils {
         }
 
     fun FackBooklogin() {
-        MobSDK.submitPolicyGrantResult(true, null)
         val plat = ShareSDK.getPlatform(Facebook.NAME)
 //授权回调监听，监听oncomplete，onerror，oncancel三种状态
         plat.platformActionListener = object : PlatformActionListener {
@@ -209,11 +210,6 @@ class WeChatUtils {
                 Log.e("MXL", "FaceBook:onCancel")
             }
         }
-      //  plat.authorize()
-        if (plat.isAuthValid()) {
-            plat.removeAccount(true)
-            return
-        }
         plat.showUser(null)
     }
 
@@ -224,8 +220,14 @@ class WeChatUtils {
 //授权回调监听，监听oncomplete，onerror，oncancel三种状态
         plat.platformActionListener = object : PlatformActionListener {
             override fun onComplete(p0: Platform?, p1: Int, p2: HashMap<String, Any>?) {
-                Log.e("MXL", "onComplete")
+                Log.e("MXL", "onComplete" + p0?.db?.userIcon + p0?.db?.userId)
                 Log.e("MXL", "Data:" + p0?.db?.exportData())
+                if (p2 != null) {
+                    val g = Gson()
+                    val obj: JsonObject = g.fromJson(p0?.db?.exportData(), JsonObject::class.java)
+                    Log.e("MXL", "PIC:" + obj.get("picture"))
+                    bindGoogle(p0?.db?.userId, p0?.db?.userName, obj.get("picture").toString())
+                }
 
             }
 
@@ -240,9 +242,28 @@ class WeChatUtils {
                 Log.e("MXL", "onCancel")
             }
         }
-     // plat.authorize()
-       plat.showUser(null)
+        // plat.authorize()
+        plat.showUser(null)
 
     }
 
+    fun bindGoogle(userId: String?, userName: String?, picture: String?) {
+        ApiClient.homeApi.authGoogleLogin(userId, userName, picture)
+            .compose(RxSchedulers.observableIO2Main())
+            .subscribe(object : BaseObserver<WxBindEntity>() {
+                override fun onSuccess(result: WxBindEntity?) {
+                    SettingPreference.saveToken(result?.token)
+                    Log.e("MXL", "谷歌登录成功")
+                    //  getShareCon tent(mContext)
+                    //   callBack.loginSuccess(lottery)
+                    callBack.loginSuccess("")
+                }
+
+                override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
+                    //   callBack.loginSuccess(lottery)
+                }
+
+            })
+
+    }
 }
\ No newline at end of file

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

@@ -42,6 +42,6 @@ class ThirdpartyLoginActivity:BaseActivity(), WeChatLoginSuccessCallBall {
     }
 
     override fun loginSuccess(lottery: String?) {
-
+        this.finish()
     }
 }
\ No newline at end of file

moduleMain/src/main/java/com/zxhl/main/page/adapter/BoxOrderAdapter.kt

@@ -37,8 +37,8 @@ class BoxOrderAdapter : BaseRecyclerAdapter<ShopOrderEntity, BoxOrderAdapter.Vie
         var total=AppContext.get().getString(R.string.total)
         var discount=AppContext.get().getString(R.string.discount)
         var express_fee=AppContext.get().getString(R.string.express_fee)
-        holder.id_tv_pricedesc?.text = "${total}:$${bean.totalPrice}｜${discount}:$${bean.discount}｜${express_fee}:$${bean.freight}｜"
-        holder.id_tv_order_no?.text = bean.orderNo
+        holder.id_tv_pricedesc?.text = "${total}:$${bean.totalPrice}｜${discount}:$${bean.discount}｜${express_fee}:$${bean.freight}"
+        holder.id_tv_order_no?.text = "${bean.orderNo} |"
         holder.id_tv_pay_time?.text = bean.payTime
         var mAdapter: ItemOrderAdapter? = ItemOrderAdapter(mContext)
         holder.id_rl_order_item?.layoutManager =
@@ -64,7 +64,7 @@ class BoxOrderAdapter : BaseRecyclerAdapter<ShopOrderEntity, BoxOrderAdapter.Vie
         var id_tv_pricedesc: TextView?
         var id_tv_order_no: TextView?
         var id_tv_pay_time: TextView?
-        var img_order_no_copy: ImageView?
+        var img_order_no_copy: TextView?
         var id_rl_order_item: RecyclerView?
 
         constructor(
@@ -76,7 +76,7 @@ class BoxOrderAdapter : BaseRecyclerAdapter<ShopOrderEntity, BoxOrderAdapter.Vie
             id_tv_pricedesc = itemView.findViewById<TextView>(R.id.id_tv_pricedesc)
             id_tv_order_no = itemView.findViewById<TextView>(R.id.id_tv_order_no)
             id_tv_pay_time = itemView.findViewById<TextView>(R.id.id_tv_pay_time)
-            img_order_no_copy = itemView.findViewById<ImageView>(R.id.img_order_no_copy)
+            img_order_no_copy = itemView.findViewById<TextView>(R.id.img_order_no_copy)
             id_rl_order_item = itemView.findViewById<RecyclerView>(R.id.id_rl_order_item)
 
         }

moduleMain/src/main/java/com/zxhl/main/page/adapter/ItemGoodsAdapter.kt

@@ -4,11 +4,13 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.zxhl.cms.AppContext
 import com.zxhl.cms.common.base.BaseRecyclerAdapter
 import com.zxhl.cms.net.model.box.GoodList
+import com.zxhl.cms.utils.JumpUtils
 import com.zxhl.cms.widget.RecycleImageView
 import com.zxhl.main.R
 
@@ -26,6 +28,9 @@ class ItemGoodsAdapter : BaseRecyclerAdapter<GoodList, ItemGoodsAdapter.ViewHold
         holder.item_goods_img?.setLoadImageUrl(bean.mainImage, false)
         holder.item_goods_name?.text = bean.productName
         holder.item_goods_price?.text = "$${bean.salePriceStr}"
+        holder.id_tv_item_layout?.setOnClickListener {
+            JumpUtils.goodsDetailJump(bean?.boxId)
+        }
     }
 
 
@@ -40,6 +45,7 @@ class ItemGoodsAdapter : BaseRecyclerAdapter<GoodList, ItemGoodsAdapter.ViewHold
         var item_goods_img: RecycleImageView?
         var item_goods_name: TextView?
         var item_goods_price: TextView?
+        var id_tv_item_layout: LinearLayout?
 
         constructor(
             itemView: View
@@ -47,6 +53,7 @@ class ItemGoodsAdapter : BaseRecyclerAdapter<GoodList, ItemGoodsAdapter.ViewHold
             item_goods_img = itemView.findViewById<RecycleImageView>(R.id.id_img_goods)
             item_goods_name = itemView.findViewById<TextView>(R.id.id_tv_goods_name)
             item_goods_price = itemView.findViewById<TextView>(R.id.id_tv_goods_price)
+            id_tv_item_layout = itemView.findViewById<LinearLayout>(R.id.id_tv_item_layout)
 
         }
     }

moduleMain/src/main/java/com/zxhl/main/page/adapter/ShopOrderAdapter.kt

@@ -47,7 +47,7 @@ class ShopOrderAdapter : BaseRecyclerAdapter<ShopOrderEntity, ShopOrderAdapter.V
         var total=AppContext.get().getString(R.string.total)
         var discount=AppContext.get().getString(R.string.discount)
         var express_fee=AppContext.get().getString(R.string.express_fee)
-        holder.id_tv_pricedesc?.text = "${total}:$${mPrice}｜${discount}:$${bean.discount}｜${express_fee}:$${bean.freight}｜"
+        holder.id_tv_pricedesc?.text = "${total}:$${mPrice}｜${discount}:$${bean.discount}｜${express_fee}:$${bean.freight}"
         if (bean.orderStatus == 0) {
             holder.id_tv_status?.text = AppContext.get().getString(R.string.unshipped)
         } else if (bean.orderStatus == 1) {
@@ -59,7 +59,7 @@ class ShopOrderAdapter : BaseRecyclerAdapter<ShopOrderEntity, ShopOrderAdapter.V
         holder.id_img_goods?.setLoadImageUrl(bean.goodsList?.get(0)?.mainImage, false)
         holder.id_tv_nums?.text = "x ${bean.goodsList?.get(0)?.amount}"
         holder.id_tv_sale_price?.text = "$ ${bean.goodsList?.get(0)?.salePriceStr}"
-        holder.id_tv_order_no?.text = bean.orderNo
+        holder.id_tv_order_no?.text = "${bean.orderNo} |"
         holder.id_tv_pay_time?.text = bean.payTime
     }
 
@@ -84,8 +84,8 @@ class ShopOrderAdapter : BaseRecyclerAdapter<ShopOrderEntity, ShopOrderAdapter.V
         var id_tv_pricedesc: TextView?
         var id_tv_order_no: TextView?
         var id_tv_pay_time: TextView?
-        var id_img_copy: ImageView?
-        var img_order_no_copy: ImageView?
+        var id_img_copy: TextView?
+        var img_order_no_copy: TextView?
 
 
         constructor(
@@ -102,8 +102,8 @@ class ShopOrderAdapter : BaseRecyclerAdapter<ShopOrderEntity, ShopOrderAdapter.V
             id_tv_pricedesc = itemView.findViewById<TextView>(R.id.id_tv_pricedesc)
             id_tv_order_no = itemView.findViewById<TextView>(R.id.id_tv_order_no)
             id_tv_pay_time = itemView.findViewById<TextView>(R.id.id_tv_pay_time)
-            id_img_copy = itemView.findViewById<ImageView>(R.id.id_img_copy)
-            img_order_no_copy = itemView.findViewById<ImageView>(R.id.img_order_no_copy)
+            id_img_copy = itemView.findViewById<TextView>(R.id.id_img_copy)
+            img_order_no_copy = itemView.findViewById<TextView>(R.id.img_order_no_copy)
             id_img_goods = itemView.findViewById<RecycleImageView>(R.id.id_img_goods)
 
         }

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

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/id_tv_item_layout"
     android:layout_width="75dp"
     android:layout_height="wrap_content"
     android:layout_margin="5dp"

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

@@ -28,15 +28,19 @@
             android:text="YT129845086740"
             android:textColor="@color/color_999999"
             android:textSize="12sp" />
-
-        <ImageView
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="|"
+        android:layout_marginLeft="10dp"/>
+        <TextView
             android:id="@+id/id_img_copy"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="1dp"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
-            android:src="@drawable/icon_copy" />
+            android:text="@string/copy" />
 
         <TextView
             android:id="@+id/id_tv_status"
@@ -112,30 +116,43 @@
         android:background="#EDEDED" />
 
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:orientation="vertical"
         android:padding="10dp">
 
         <TextView
             android:id="@+id/id_tv_pricedesc"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:text="222"
+            android:layout_gravity="right"
             android:textColor="@color/color_999999"
             android:textSize="12sp" />
 
-        <TextView
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/paid"
-            android:textColor="@color/color_333333"
-            android:textSize="12sp" />
+            android:orientation="horizontal"
+            android:layout_marginTop="5dp"
+            android:gravity="right"
+            >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/paid"
+                android:textColor="@color/color_333333"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/id_tv_total_price"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/color_4c84ff"
+                android:textSize="12sp" />
+        </LinearLayout>
 
-        <TextView
-            android:id="@+id/id_tv_total_price"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/color_4c84ff"
-            android:textSize="12sp" />
     </LinearLayout>
 
     <LinearLayout
@@ -154,19 +171,25 @@
 
         <TextView
             android:id="@+id/id_tv_order_no"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:gravity="right|center_vertical"
+            android:lines="1"
             android:text="1298450867405086740"
             android:textColor="@color/color_999999"
             android:textSize="12sp" />
 
-        <ImageView
+        <TextView
             android:id="@+id/img_order_no_copy"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:src="@drawable/icon_copy" />
+            android:text="@string/copy"
+            android:textColor="@color/color_333333"
+            android:textSize="12sp" />
     </LinearLayout>
 
     <LinearLayout
@@ -184,8 +207,10 @@
 
         <TextView
             android:id="@+id/id_tv_pay_time"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="right"
             android:text="1298450867405086740"
             android:textColor="@color/color_999999"
             android:textSize="12sp" />

tmpmob/ShareSDK/assets/ShareSDK.xml

@@ -6,7 +6,7 @@
 <QZone Enable="false" />
 <Renren Enable="false" />
 <KaiXin Enable="false" />
-<Facebook Id="8" SortId="8" OfficialVersion="default" FaceBookLoginProtocolScheme="fb1412473428822331" ShareByAppClient="true" Enable="true" ConsumerKey="1412473428822331" ConsumerSecret="a42f4f3f867dc947b9ed6020c2e93558" RedirectUrl="https://www.baidu.com" />
+<Facebook Id="8" SortId="8" OfficialVersion="default" FaceBookLoginProtocolScheme="fb662970168312513" ShareByAppClient="true" Enable="true" ConsumerKey="662970168312513" RedirectUrl="https://www.baidu.com" />
 <Twitter Enable="false" />
 <Evernote Enable="false" />
 <FourSquare Enable="false" />