kaijia 5 ヶ月 前
コミット
732d3d7b2d

+ 0 - 1
app/src/main/java/com/kx/liedouYX/ui/activity/mine/ScllActivity.java

@@ -39,7 +39,6 @@ public class ScllActivity extends BaseActivity {
39 39
     @BindView(R.id.scll_fragment)
40 40
     FrameLayout scllFragment;
41 41
     private MyScFragment myScFragment;
42
-    private MyScFragment mysc;
43 42
     private LljlFragment lljlFragment;
44 43
 
45 44
     @Override

+ 0 - 2
app/src/main/java/com/kx/liedouYX/ui/activity/mine/TqjsActivity.java

@@ -144,8 +144,6 @@ public class TqjsActivity extends BaseActivity {
144 144
                     parent.removeView(view);
145 145
                 }
146 146
                 container.addView(view);
147
-                //add listeners here if necessary
148
-
149 147
                 return position;
150 148
             }
151 149
 

+ 2 - 1
app/src/main/java/com/kx/liedouYX/ui/activity/mine/ZfbtxActivity.java

@@ -2,6 +2,7 @@ package com.kx.liedouYX.ui.activity.mine;
2 2
 
3 3
 import android.os.Bundle;
4 4
 import android.text.TextUtils;
5
+import android.util.Log;
5 6
 import android.view.View;
6 7
 import android.widget.EditText;
7 8
 import android.widget.ImageView;
@@ -105,7 +106,7 @@ public class ZfbtxActivity extends BaseActivity implements IApplyView {
105 106
                     String alipay_account = data.getAlipay_account();
106 107
                     String real_name = data.getReal_name();
107 108
                     String can_use_money = data.getCan_use_money();
108
-
109
+                    Log.e(TAG, "alipay_account: " + alipay_account + " real_name: " + real_name + "  can_use_money: " + can_use_money);
109 110
                 }
110 111
             }
111 112
         }

+ 0 - 13
app/src/main/java/com/kx/liedouYX/ui/activity/share/ShareActivity.java

@@ -282,7 +282,6 @@ public class ShareActivity extends BaseActivity {
282 282
                                         String nickname = shopDataBean.getUserinfo().getNickname();
283 283
                                         String invite_code = shopDataBean.getUserinfo().getInvite_code();
284 284
                                         Bitmap bitmap1 = ShareImgUtils.getInstance().newBitmap(title, drawable, bitmap, qrBitmap, headerBitmap, discount_price, parseDouble, nickname, invite_code);
285
-//                                        testImage.setImageBitmap(bitmap1);
286 285
                                         WxChatUtils.getInstance().shareImage(bitmap1);
287 286
                                     } catch (WriterException e) {
288 287
                                         e.printStackTrace();
@@ -321,7 +320,6 @@ public class ShareActivity extends BaseActivity {
321 320
                                         String nickname = jdData.getUserinfo().getNickname();
322 321
                                         String invite_code = jdData.getUserinfo().getInvite_code();
323 322
                                         Bitmap bitmap1 = ShareImgUtils.getInstance().newBitmap(title, drawable, bitmap, qrBitmap, headerBitmap, discount_price, price1, nickname, invite_code);
324
-//                                        testImage.setImageBitmap(bitmap1);
325 323
                                         WxChatUtils.getInstance().shareImage(bitmap1);
326 324
                                     } catch (WriterException e) {
327 325
                                         e.printStackTrace();
@@ -360,7 +358,6 @@ public class ShareActivity extends BaseActivity {
360 358
                                         String nickname = pddData.getUserinfo().getNickname();
361 359
                                         String invite_code = pddData.getUserinfo().getInvite_code();
362 360
                                         Bitmap bitmap1 = ShareImgUtils.getInstance().newBitmap(title, drawable, bitmap, qrBitmap, headerBitmap, discount_price, price1, nickname, invite_code);
363
-//                                        testImage.setImageBitmap(bitmap1);
364 361
                                         WxChatUtils.getInstance().shareImage(bitmap1);
365 362
                                     } catch (WriterException e) {
366 363
                                         e.printStackTrace();
@@ -399,7 +396,6 @@ public class ShareActivity extends BaseActivity {
399 396
                                         String nickname = dyRst.getUserinfo().getNickname();
400 397
                                         String invite_code = dyRst.getUserinfo().getInvite_code();
401 398
                                         Bitmap bitmap1 = ShareImgUtils.getInstance().newBitmap(title, drawable, bitmap, qrBitmap, headerBitmap, discount_price, price1, nickname, invite_code);
402
-//                                        testImage.setImageBitmap(bitmap1);
403 399
                                         WxChatUtils.getInstance().shareImage(bitmap1);
404 400
                                     } catch (WriterException e) {
405 401
                                         e.printStackTrace();
@@ -439,7 +435,6 @@ public class ShareActivity extends BaseActivity {
439 435
                                         String nickname = wphData.getUserinfo().getNickname();
440 436
                                         String invite_code = wphData.getUserinfo().getInvite_code();
441 437
                                         Bitmap bitmap1 = ShareImgUtils.getInstance().newBitmap(title, drawable, bitmap, qrBitmap, headerBitmap, discount_price, parseDouble, nickname, invite_code);
442
-//                                        testImage.setImageBitmap(bitmap1);
443 438
                                         WxChatUtils.getInstance().shareImage(bitmap1);
444 439
                                     } catch (WriterException e) {
445 440
                                         e.printStackTrace();
@@ -481,12 +476,4 @@ public class ShareActivity extends BaseActivity {
481 476
         linearLayout.draw(canvas);
482 477
         return bitmap;
483 478
     }
484
-
485
-
486
-    @Override
487
-    protected void onCreate(Bundle savedInstanceState) {
488
-        super.onCreate(savedInstanceState);
489
-        // TODO: add setContentView(...) invocation
490
-        ButterKnife.bind(this);
491
-    }
492 479
 }

+ 4 - 2
app/src/main/res/layout/activity_share.xml

@@ -3,7 +3,8 @@
3 3
     xmlns:tools="http://schemas.android.com/tools"
4 4
     android:layout_width="match_parent"
5 5
     android:layout_height="match_parent"
6
-    tools:context=".ui.activity.share.ShareActivity">
6
+    tools:context=".ui.activity.share.ShareActivity"
7
+    tools:ignore="HardcodedText">
7 8
 
8 9
     <RelativeLayout
9 10
         android:id="@+id/inflate_layout"
@@ -110,7 +111,8 @@
110 111
         android:padding="10dp"
111 112
         android:text="提示:点击【分享】将自动复制文案和转发选中的图片,请前往对话框进行文字粘贴"
112 113
         android:textColor="@color/red"
113
-        android:textSize="10sp" />
114
+        android:textSize="10sp"
115
+        tools:ignore="HardcodedText" />
114 116
 
115 117
     <TextView
116 118
         android:id="@+id/share_tv"

+ 2 - 2
magicindicator/magicindicator.iml

@@ -31,10 +31,10 @@
31 31
     <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
32 32
     <exclude-output />
33 33
     <content url="file://$MODULE_DIR$">
34
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
34
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
35 35
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
36 36
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
37
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
37
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
38 38
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
39 39
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
40 40
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />