Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

app/build.gradle

@@ -97,12 +97,15 @@ android {
             buildConfigField "boolean", "KF_DEBUG", 'false'
             buildConfigField "String", "API_DOMAIN", '"app.bandai.yunduanzs.cn"'
             buildConfigField "String", "APP_URL", '"http://ss.kfzs.com/"'
+//            buildConfigField "String", "APP_URL", '"http://10.8.220.5:8080/"'//张伟
+//            buildConfigField "String", "APP_URL", '"http://test.sheep.kfzs.com/"'//测试服地址
             buildConfigField "String", "JFSC_DOMAIN", '"http://jf.bandaimi.com/"'//积分商城
 //            buildConfigField "String", "API_DOMAIN", '"app.bdmoem.kfzs.com"'
 //            buildConfigField "String", "JFSC_DOMAIN", '"http://jf.bdmoem.kfzs.com/"'//积分商城
             buildConfigField "String", "CAPTCHA_DOMAIN", '"captcha.kuaifazs.com"'
             buildConfigField "String", "umeng_appkey", '"58dc9509aed17959a3001bff"'
             signingConfig signingConfigs.config
+
         }
     }
 }
@@ -119,9 +122,9 @@ dependencies {
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     testCompile 'junit:junit:4.12'
 
-    //    compile 'com.shark:screencapture:1.0.0'
     compile 'com.google.code.gson:gson:2.8.2'
     compile('com.jcodecraeer:xrecyclerview:1.5.2') {
+    //    compile 'com.shark:screencapture:1.0.0'
         exclude group: 'com.android.support', module: 'design'
     }
     compile 'com.squareup.okhttp3:okhttp:3.10.0'

app/src/main/java/com/sheep/gamegroup/model/api/BaseMessageConverter.java

@@ -22,6 +22,7 @@ public class BaseMessageConverter implements Converter<ResponseBody, BaseMessage
     @Override
     public BaseMessage convert(ResponseBody value) throws IOException {
         String json = decrypt(value.string());
+//        String json = value.string();
         BaseMessage baseMessage = JSONObject.parseObject(json, BaseMessage.class);
         return baseMessage;
     }

app/src/main/java/com/sheep/gamegroup/model/util/SheepSubscriber.java

@@ -63,7 +63,8 @@ public abstract class SheepSubscriber<T> extends Subscriber<T> {
                     Jump2View.getInstance().goLoginView(SheepApp.mContext, "");
                     return;
                 }
-                BaseMessage baseMessage = JSONObject.parseObject(BaseMessageConverter.decrypt(throwable.message), BaseMessage.class);
+//                BaseMessage baseMessage = JSONObject.parseObject(BaseMessageConverter.decrypt(throwable.message), BaseMessage.class);
+                BaseMessage baseMessage = JSONObject.parseObject(throwable.message, BaseMessage.class);
                 if(baseMessage.getCode() == 0)
                     baseMessage.setCode(throwable.code);
                 onError(baseMessage);

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

@@ -52,7 +52,7 @@ public class MyDbManager {
      * 查找表
      */
     public UserEntity dbFindUser() throws DbException{
-        List<UserEntity> users = db.selector(UserEntity.class).findAll();
+        List<UserEntity> users = db.findAll(UserEntity.class);
         UserEntity userEntity = null;
         if(users != null && users.size()>0){
             userEntity = users.get(0);

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

@@ -120,7 +120,7 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
             userEntity.setWx_openid("succes");
             MyDbManager.getInstance().saveOrUpdateUser(userEntity);
             SpUtils.saveWeixin(activity, "succes");
-        } catch (DbException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
         ActivityManager.getInstance()

app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -130,6 +130,11 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 }else{
                     viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.GONE);
                 }
+                if(i == getItemCount()-1){
+                    viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.GONE);
+                }else {
+                    viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.VISIBLE);
+                }
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_anem_tv)).setText(etyList.get(i).getName()+"");
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_num_tv)).setText("剩余"+ etyList.get(i).getLast_num()+"份");
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ etyList.get(i).getBonus() +"元");

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

@@ -14,8 +14,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:background="@color/white">
+            android:orientation="vertical">
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

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

@@ -98,8 +98,7 @@
                 android:id="@+id/change_phone_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:background="@color/white">
+                android:orientation="vertical">
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"

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

@@ -31,7 +31,7 @@
             android:text="取消任务"
             android:minWidth="@dimen/view_size_80"
             android:textColor="@color/white"
-            android:textSize="15dp"
+            android:textSize="@dimen/text_size_12"
             android:gravity="center"
             android:layout_marginBottom="13dp"
             android:padding="@dimen/content_padding_3"
@@ -80,9 +80,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="任务详情"
-            android:minWidth="@dimen/view_size_73"
+            android:minWidth="@dimen/view_size_80"
             android:textColor="@color/white"
-            android:textSize="@dimen/text_size_15"
+            android:textSize="@dimen/text_size_12"
             android:gravity="center"
             android:padding="@dimen/content_padding_3"
             android:layout_alignParentRight="true"

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

@@ -7,7 +7,7 @@
     android:paddingRight="12dp"
     android:paddingTop="12dp"
     android:paddingLeft="20dp"
-    android:paddingBottom="12dp">
+    android:paddingBottom="@dimen/content_padding_small">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -47,7 +47,7 @@
             android:id="@+id/item_anem_tv"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="adefasdddddddddddddddddddddddddddddddddddd"
+            android:text=""
             android:lines="2"
             android:gravity="start|center"
             app:layout_constraintTop_toTopOf="parent"
@@ -59,7 +59,7 @@
             android:id="@+id/item_num_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="asdfasdfasdf"
+            android:text=""
             app:layout_constraintTop_toBottomOf="@+id/item_anem_tv"
             app:layout_constraintStart_toStartOf="@+id/item_anem_tv"
             android:textColor="@color/txt_black_8e8e8e"
@@ -70,9 +70,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="任务详情"
-            android:minWidth="@dimen/view_size_73"
+            android:minWidth="@dimen/view_size_80"
             android:textColor="@color/white"
-            android:textSize="@dimen/text_size_15"
+            android:textSize="@dimen/text_size_12"
             android:gravity="center"
             android:padding="@dimen/content_padding_3"
             app:layout_constraintBaseline_toBaselineOf="@+id/item_num_tv"
@@ -85,5 +85,5 @@
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
         android:background="@color/white_bg_line"
-        android:layout_marginTop="17dp"/>
+        android:layout_marginTop="@dimen/content_padding_20"/>
 </LinearLayout>

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

@@ -12,5 +12,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:listSelector="@color/transparent"
+        android:layout_margin="@dimen/content_padding_13"
         android:scrollbars="none"></ListView>
 </LinearLayout>

app/src/main/res/values/common.xml

@@ -77,6 +77,7 @@
     <dimen name="content_padding_8">8dp</dimen>
     <dimen name="content_padding_big">18dp</dimen>
     <dimen name="content_padding_10">10dp</dimen>
+    <dimen name="content_padding_12">12dp</dimen>
     <dimen name="content_padding_13">13dp</dimen>
     <dimen name="content_padding_15">15dp</dimen>
     <dimen name="content_padding_20">20dp</dimen>